You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2017/12/28 17:53:59 UTC

[apex-malhar] branch master updated (600d435 -> 0d98d05)

This is an automated email from the ASF dual-hosted git repository.

vrozov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apex-malhar.git.


    from 600d435  APEXMALHAR-2034 Creating new Avro Module in contrib
     new 192d65a  relocate library, contrib, benchmark, hive packages - rename files
     new 0d98d05  APEXMALHAR-2517 imports/checkstyle #662

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 apps/filecopy/pom.xml                              |    4 +-
 .../com/datatorrent/apps/copy/HDFSFileCopyApp.java |    4 +-
 apps/logstream/pom.xml                             |    2 +-
 .../logstream/AggregationsToRedisOperator.java     |    4 +-
 .../datatorrent/apps/logstream/Application.java    |   29 +-
 .../datatorrent/apps/logstream/Application1.java   |    5 +-
 .../apps/logstream/DimensionOperator.java          |    5 +-
 .../apps/logstream/DimensionOperatorUnifier.java   |    3 +-
 .../apps/logstream/LogScoreOperator.java           |    4 +-
 .../datatorrent/apps/logstream/LogstreamTopN.java  |    6 +-
 .../logstream/LogstreamWidgetOutputOperator.java   |    5 +-
 .../apps/logstream/RabbitMQLogsInputOperator.java  |    3 +-
 .../apps/logstream/DimensionOperatorTest.java      |    5 +-
 .../logstream/DimensionOperatorUnifierTest.java    |    5 +-
 .../apps/logstream/FilterOperatorTest.java         |    2 +-
 .../apps/logstream/LogstreamTopNTest.java          |    5 +-
 apps/pom.xml                                       |    2 +-
 benchmark/pom.xml                                  |    2 +-
 .../datatorrent/benchmark/ApplicationFixed.java    |   58 -
 .../java/com/datatorrent/benchmark/Benchmark.java  |  151 --
 .../datatorrent/benchmark/CouchBaseAppInput.java   |   50 -
 .../datatorrent/benchmark/CouchBaseAppOutput.java  |   58 -
 .../benchmark/CouchBaseInputOperator.java          |   64 -
 .../benchmark/CouchBaseOutputOperator.java         |   44 -
 .../benchmark/FixedTuplesInputOperator.java        |  101 -
 .../com/datatorrent/benchmark/RandomMapOutput.java |   67 -
 .../benchmark/RandomWordInputModule.java           |  147 --
 .../datatorrent/benchmark/WordCountOperator.java   |   92 -
 .../AerospikeOutputBenchmarkApplication.java       |   65 -
 .../aerospike/AerospikeOutputOperator.java         |   51 -
 .../algo/UniqueValueCountBenchmarkApplication.java |   81 -
 .../CassandraOutputBenchmarkApplication.java       |   66 -
 .../cassandra/CassandraOutputOperator.java         |   53 -
 .../benchmark/fs/FSByteOutputOperator.java         |   74 -
 .../benchmark/fs/FSOutputOperatorBenchmark.java    |   71 -
 .../benchmark/hive/HiveInsertBenchmarkingApp.java  |  217 --
 .../hive/HiveMapInsertBenchmarkingApp.java         |  144 -
 .../kafka/BenchmarkKafkaInputOperator.java         |   49 -
 .../BenchmarkPartitionableKafkaOutputOperator.java |  274 --
 .../benchmark/kafka/KafkaInputBenchmark.java       |  103 -
 .../benchmark/kafka/KafkaOutputBenchmark.java      |   46 -
 .../benchmark/kafka/KafkaTestPartitioner.java      |   44 -
 .../com/datatorrent/benchmark/package-info.java    |   22 -
 .../script/RubyOperatorBenchmarkApplication.java   |   77 -
 .../benchmark/spillable/SpillableBenchmarkApp.java |   72 -
 .../spillable/SpillableTestInputOperator.java      |   49 -
 .../benchmark/spillable/SpillableTestOperator.java |  212 --
 .../benchmark/state/ManagedStateBenchmarkApp.java  |  224 --
 .../datatorrent/benchmark/state/StoreOperator.java |  299 ---
 .../benchmark/stream/DevNullCounterBenchmark.java  |   72 -
 .../benchmark/stream/IntegerOperator.java          |   76 -
 .../benchmark/stream/StreamDuplicaterApp.java      |   62 -
 .../benchmark/stream/StreamMergeApp.java           |   59 -
 .../benchmark/testbench/EventClassifierApp.java    |   88 -
 .../EventClassifierNumberToHashDoubleApp.java      |   63 -
 .../benchmark/testbench/EventGeneratorApp.java     |   62 -
 .../benchmark/testbench/EventIncrementerApp.java   |   71 -
 .../benchmark/testbench/FilterClassifierApp.java   |   92 -
 .../testbench/FilteredEventClassifierApp.java      |   90 -
 .../benchmark/testbench/HashMapOperator.java       |  153 --
 .../testbench/RandomEventGeneratorApp.java         |   52 -
 .../benchmark/testbench/SeedEventGeneratorApp.java |   76 -
 .../benchmark/testbench/ThroughputCounterApp.java  |   55 -
 .../benchmark/window/AbstractGenerator.java        |   89 -
 .../AbstractWindowedOperatorBenchmarkApp.java      |  227 --
 .../window/KeyedWindowedOperatorBenchmarkApp.java  |  170 --
 .../window/WindowedOperatorBenchmarkApp.java       |  128 -
 .../apache/apex/benchmark/ApplicationFixed.java    |   58 +
 .../java/org/apache/apex/benchmark/Benchmark.java  |  151 ++
 .../apache/apex/benchmark/CouchBaseAppInput.java   |   50 +
 .../apache/apex/benchmark/CouchBaseAppOutput.java  |   58 +
 .../apex/benchmark/CouchBaseInputOperator.java     |   64 +
 .../apex/benchmark/CouchBaseOutputOperator.java    |   44 +
 .../apex/benchmark/FixedTuplesInputOperator.java   |  101 +
 .../org/apache/apex/benchmark/RandomMapOutput.java |   67 +
 .../apex/benchmark/RandomWordInputModule.java      |  147 ++
 .../apache/apex/benchmark/WordCountOperator.java   |   92 +
 .../AerospikeOutputBenchmarkApplication.java       |   65 +
 .../aerospike/AerospikeOutputOperator.java         |   51 +
 .../algo/UniqueValueCountBenchmarkApplication.java |   79 +
 .../CassandraOutputBenchmarkApplication.java       |   64 +
 .../cassandra/CassandraOutputOperator.java         |   53 +
 .../apex/benchmark/fs/FSByteOutputOperator.java    |   74 +
 .../benchmark/fs/FSOutputOperatorBenchmark.java    |   69 +
 .../benchmark/hive/HiveInsertBenchmarkingApp.java  |  217 ++
 .../hive/HiveMapInsertBenchmarkingApp.java         |  143 +
 .../kafka/BenchmarkKafkaInputOperator.java         |   50 +
 .../BenchmarkPartitionableKafkaOutputOperator.java |  274 ++
 .../apex/benchmark/kafka/KafkaInputBenchmark.java  |  102 +
 .../apex/benchmark/kafka/KafkaOutputBenchmark.java |   46 +
 .../apex/benchmark/kafka/KafkaTestPartitioner.java |   44 +
 .../org/apache/apex/benchmark/package-info.java    |   22 +
 .../script/RubyOperatorBenchmarkApplication.java   |   75 +
 .../benchmark/spillable/SpillableBenchmarkApp.java |   72 +
 .../spillable/SpillableTestInputOperator.java      |   49 +
 .../benchmark/spillable/SpillableTestOperator.java |  212 ++
 .../benchmark/state/ManagedStateBenchmarkApp.java  |  224 ++
 .../apache/apex/benchmark/state/StoreOperator.java |  299 +++
 .../benchmark/stream/DevNullCounterBenchmark.java  |   72 +
 .../apex/benchmark/stream/IntegerOperator.java     |   76 +
 .../apex/benchmark/stream/StreamDuplicaterApp.java |   62 +
 .../apex/benchmark/stream/StreamMergeApp.java      |   59 +
 .../benchmark/testbench/EventClassifierApp.java    |   88 +
 .../EventClassifierNumberToHashDoubleApp.java      |   63 +
 .../benchmark/testbench/EventGeneratorApp.java     |   62 +
 .../benchmark/testbench/EventIncrementerApp.java   |   71 +
 .../benchmark/testbench/FilterClassifierApp.java   |   92 +
 .../testbench/FilteredEventClassifierApp.java      |   90 +
 .../apex/benchmark/testbench/HashMapOperator.java  |  154 ++
 .../testbench/RandomEventGeneratorApp.java         |   52 +
 .../benchmark/testbench/SeedEventGeneratorApp.java |   77 +
 .../benchmark/testbench/ThroughputCounterApp.java  |   55 +
 .../apex/benchmark/window/AbstractGenerator.java   |   89 +
 .../AbstractWindowedOperatorBenchmarkApp.java      |  227 ++
 .../window/KeyedWindowedOperatorBenchmarkApp.java  |  170 ++
 .../apache/apex}/benchmark/window/README.md        |    0
 .../window/WindowedOperatorBenchmarkApp.java       |  128 +
 .../benchmark/ApplicationFixedTest.java            |   52 -
 .../com/datatorrent/benchmark/BenchmarkTest.java   |   53 -
 .../benchmark/CouchBaseBenchmarkTest.java          |   87 -
 .../benchmark/accumulo/AccumuloApp.java            |   76 -
 .../benchmark/accumulo/AccumuloAppTest.java        |   32 -
 .../aerospike/AerospikeBenchmarkAppTest.java       |   34 -
 .../algo/UniqueValueCountBenchmarkTest.java        |   41 -
 .../cassandra/CassandraApplicatonTest.java         |   37 -
 .../benchmark/hbase/HBaseApplicationTest.java      |   37 -
 .../hbase/HBaseCsvMappingApplication.java          |   58 -
 .../benchmark/hive/HiveInsertBenchmarkTest.java    |   76 -
 .../benchmark/hive/HiveMapBenchmarkTest.java       |   79 -
 .../benchmark/kafka/KafkaInputBenchmarkTest.java   |   50 -
 .../benchmark/kafka/KafkaOutputBenchmarkTest.java  |   50 -
 .../benchmark/memsql/MemsqlInputBenchmark.java     |   65 -
 .../benchmark/memsql/MemsqlInputBenchmarkTest.java |  109 -
 .../benchmark/memsql/MemsqlOutputBenchmark.java    |  104 -
 .../memsql/MemsqlOutputBenchmarkTest.java          |   69 -
 .../script/RubyOperatorBenchmarkAppTest.java       |   41 -
 .../spillable/SpillableBenchmarkAppTester.java     |   84 -
 .../spillable/SpillableDSBenchmarkTest.java        |  169 --
 .../state/ManagedStateBenchmarkAppTest.java        |   98 -
 .../testbench/EventClassifierAppTest.java          |   58 -
 .../EventClassifierNumberToHashDoubleAppTest.java  |   59 -
 .../benchmark/testbench/EventGeneratorAppTest.java |   61 -
 .../testbench/EventIncrementerAppTest.java         |   59 -
 .../testbench/FilterClassifierAppTest.java         |   59 -
 .../testbench/FilteredEventClassifierAppTest.java  |   58 -
 .../testbench/ThroughputCounterAppTest.java        |   58 -
 .../util/serde/GenericSerdePerformanceTest.java    |  115 -
 .../KeyedWindowedOperatorBenchmarkAppTest.java     |   75 -
 .../window/WindowedOperatorBenchmarkAppTest.java   |   75 -
 .../apex/benchmark/ApplicationFixedTest.java       |   52 +
 .../org/apache/apex/benchmark/BenchmarkTest.java   |   53 +
 .../apex/benchmark/CouchBaseBenchmarkTest.java     |   87 +
 .../apex/benchmark/accumulo/AccumuloApp.java       |   76 +
 .../apex/benchmark/accumulo/AccumuloAppTest.java   |   32 +
 .../aerospike/AerospikeBenchmarkAppTest.java       |   34 +
 .../algo/UniqueValueCountBenchmarkTest.java        |   41 +
 .../cassandra/CassandraApplicatonTest.java         |   37 +
 .../apex/benchmark/hbase/HBaseApplicationTest.java |   37 +
 .../hbase/HBaseCsvMappingApplication.java          |   58 +
 .../benchmark/hive/HiveInsertBenchmarkTest.java    |   76 +
 .../apex/benchmark/hive/HiveMapBenchmarkTest.java  |   79 +
 .../benchmark/kafka/KafkaInputBenchmarkTest.java   |   50 +
 .../benchmark/kafka/KafkaOutputBenchmarkTest.java  |   50 +
 .../benchmark/memsql/MemsqlInputBenchmark.java     |   65 +
 .../benchmark/memsql/MemsqlInputBenchmarkTest.java |  109 +
 .../benchmark/memsql/MemsqlOutputBenchmark.java    |  104 +
 .../memsql/MemsqlOutputBenchmarkTest.java          |   69 +
 .../script/RubyOperatorBenchmarkAppTest.java       |   41 +
 .../spillable/SpillableBenchmarkAppTester.java     |   84 +
 .../spillable/SpillableDSBenchmarkTest.java        |  168 ++
 .../state/ManagedStateBenchmarkAppTest.java        |   98 +
 .../testbench/EventClassifierAppTest.java          |   58 +
 .../EventClassifierNumberToHashDoubleAppTest.java  |   59 +
 .../benchmark/testbench/EventGeneratorAppTest.java |   61 +
 .../testbench/EventIncrementerAppTest.java         |   59 +
 .../testbench/FilterClassifierAppTest.java         |   59 +
 .../testbench/FilteredEventClassifierAppTest.java  |   58 +
 .../testbench/ThroughputCounterAppTest.java        |   58 +
 .../util/serde/GenericSerdePerformanceTest.java    |  115 +
 .../KeyedWindowedOperatorBenchmarkAppTest.java     |   75 +
 .../window/WindowedOperatorBenchmarkAppTest.java   |   75 +
 contrib/pom.xml                                    |   11 +-
 .../accumulo/AbstractAccumuloInputOperator.java    |   63 -
 .../accumulo/AbstractAccumuloOutputOperator.java   |  119 -
 .../contrib/accumulo/AccumuloStore.java            |  216 --
 .../contrib/accumulo/AccumuloWindowStore.java      |  206 --
 .../datatorrent/contrib/accumulo/package-info.java |   20 -
 .../aerospike/AbstractAerospikeGetOperator.java    |   90 -
 ...stractAerospikeNonTransactionalPutOperator.java |   78 -
 .../AbstractAerospikeTransactionalPutOperator.java |   84 -
 .../AerospikePOJONonTransactionalPutOperator.java  |  100 -
 .../AerospikePOJOTransactionalPutOperator.java     |  102 -
 .../contrib/aerospike/AerospikeStore.java          |  131 -
 .../aerospike/AerospikeTransactionalStore.java     |  235 --
 .../contrib/aerospike/package-info.java            |   20 -
 .../contrib/apachelog/ApacheLogInputGenerator.java |  353 ---
 .../contrib/apachelog/ApplicationLocalLog.java     |   64 -
 .../contrib/apachelog/ApplicationLogGenerator.java |   94 -
 .../contrib/apachelog/GeoIPExtractor.java          |  100 -
 .../contrib/apachelog/TimestampExtractor.java      |   79 -
 .../contrib/apachelog/UserAgentExtractor.java      |  105 -
 .../contrib/apachelog/package-info.java            |   23 -
 .../contrib/apachelog/zmq/Application.java         |   86 -
 .../contrib/avro/AvroFileInputOperator.java        |  171 --
 .../contrib/avro/AvroFileToPojoModule.java         |   91 -
 .../datatorrent/contrib/avro/AvroRecordHelper.java |  125 -
 .../com/datatorrent/contrib/avro/AvroToPojo.java   |  413 ---
 .../com/datatorrent/contrib/avro/PojoToAvro.java   |  275 --
 .../cassandra/AbstractCassandraInputOperator.java  |  161 --
 ...ractCassandraTransactionableOutputOperator.java |   99 -
 .../cassandra/AbstractUpsertOutputOperator.java    | 1037 --------
 .../cassandra/CassandraPOJOInputOperator.java      |  394 ---
 .../cassandra/CassandraPOJOOutputOperator.java     |  377 ---
 .../contrib/cassandra/CassandraPojoUtils.java      |  318 ---
 .../CassandraPreparedStatementGenerator.java       |  289 --
 .../contrib/cassandra/CassandraStore.java          |  212 --
 .../cassandra/CassandraTransactionalStore.java     |  243 --
 .../contrib/cassandra/ConnectionStateManager.java  |  485 ----
 .../contrib/cassandra/UpsertExecutionContext.java  |  212 --
 .../contrib/cassandra/package-info.java            |   20 -
 .../couchbase/AbstractCouchBaseInputOperator.java  |  161 --
 .../couchbase/AbstractCouchBaseOutputOperator.java |  201 --
 .../couchbase/AbstractCouchBaseSetOperator.java    |   36 -
 .../contrib/couchbase/CouchBaseJSONSerializer.java |   53 -
 .../couchbase/CouchBasePOJOInputOperator.java      |  215 --
 .../contrib/couchbase/CouchBaseSerializer.java     |   28 -
 .../contrib/couchbase/CouchBaseStore.java          |  274 --
 .../contrib/couchbase/CouchBaseWindowStore.java    |  196 --
 .../couchbase/CouchbasePOJOSetOperator.java        |   95 -
 .../contrib/couchbase/package-info.java            |   20 -
 .../couchdb/AbstractCouchDBInputOperator.java      |  143 -
 .../couchdb/AbstractCouchDBOutputOperator.java     |   57 -
 .../couchdb/AbstractMapBasedInputOperator.java     |   54 -
 .../contrib/couchdb/CouchDBPOJOInputOperator.java  |  276 --
 .../contrib/couchdb/CouchDBPOJOOutputOperator.java |   73 -
 .../datatorrent/contrib/couchdb/CouchDbStore.java  |  198 --
 .../couchdb/MapBasedCouchDbOutputOperator.java     |   41 -
 .../datatorrent/contrib/couchdb/package-info.java  |   20 -
 .../AbstractElasticSearchInputOperator.java        |   99 -
 .../AbstractElasticSearchOutputOperator.java       |  197 --
 .../elasticsearch/ElasticSearchConnectable.java    |  130 -
 .../ElasticSearchMapInputOperator.java             |  110 -
 .../ElasticSearchMapOutputOperator.java            |  132 -
 .../ElasticSearchPercolatorOperator.java           |   92 -
 .../ElasticSearchPercolatorStore.java              |   80 -
 .../contrib/elasticsearch/package-info.java        |   20 -
 .../contrib/enrich/AbstractEnricher.java           |  351 ---
 .../datatorrent/contrib/enrich/BackendLoader.java  |   44 -
 .../contrib/enrich/DelimitedFSLoader.java          |  167 --
 .../com/datatorrent/contrib/enrich/FSLoader.java   |  228 --
 .../contrib/enrich/FixedWidthFSLoader.java         |  272 --
 .../com/datatorrent/contrib/enrich/JDBCLoader.java |  203 --
 .../datatorrent/contrib/enrich/JsonFSLoader.java   |   76 -
 .../datatorrent/contrib/enrich/MapEnricher.java    |  140 -
 .../contrib/enrich/NullValuesCacheManager.java     |   62 -
 .../datatorrent/contrib/enrich/POJOEnricher.java   |  289 --
 .../datatorrent/contrib/enrich/ReadOnlyBackup.java |   63 -
 .../contrib/formatter/CsvFormatter.java            |  220 --
 .../contrib/geode/AbstractGeodeInputOperator.java  |   45 -
 .../contrib/geode/AbstractGeodeOutputOperator.java |   46 -
 .../contrib/geode/GeodeCheckpointStore.java        |  329 ---
 .../contrib/geode/GeodeKeyValueStorageAgent.java   |   66 -
 .../contrib/geode/GeodePOJOOutputOperator.java     |   72 -
 .../com/datatorrent/contrib/geode/GeodeStore.java  |  300 ---
 .../contrib/geode/RegionCreateFunction.java        |   82 -
 .../hbase/AbstractHBaseAppendOutputOperator.java   |   82 -
 .../contrib/hbase/AbstractHBaseOutputOperator.java |   88 -
 .../hbase/AbstractHBasePutOutputOperator.java      |   76 -
 .../AbstractHBaseWindowAppendOutputOperator.java   |  113 -
 .../hbase/AbstractHBaseWindowOutputOperator.java   |   98 -
 .../AbstractHBaseWindowPutOutputOperator.java      |  102 -
 .../contrib/hbase/HBaseCsvMappingPutOperator.java  |  142 -
 .../datatorrent/contrib/hbase/HBaseFieldInfo.java  |  111 -
 .../contrib/hbase/HBaseFieldValueGenerator.java    |   61 -
 .../contrib/hbase/HBaseGetOperator.java            |   81 -
 .../contrib/hbase/HBaseInputOperator.java          |   36 -
 .../hbase/HBaseNameValueCsvPutOperator.java        |  165 --
 .../contrib/hbase/HBaseOperatorBase.java           |  134 -
 .../contrib/hbase/HBasePOJOInputOperator.java      |  188 --
 .../contrib/hbase/HBasePOJOPutOperator.java        |   97 -
 .../contrib/hbase/HBaseScanOperator.java           |  243 --
 .../com/datatorrent/contrib/hbase/HBaseStore.java  |  409 ---
 .../contrib/hbase/HBaseWindowStore.java            |  213 --
 .../datatorrent/contrib/hbase/OutputAdapter.java   |   82 -
 .../datatorrent/contrib/hbase/package-info.java    |   23 -
 .../datatorrent/contrib/jython/PythonOperator.java |  103 -
 .../datatorrent/contrib/jython/package-info.java   |   20 -
 .../AbstractExactlyOnceKafkaOutputOperator.java    |  197 --
 .../contrib/kafka/AbstractKafkaInputOperator.java  |  886 -------
 .../contrib/kafka/AbstractKafkaOutputOperator.java |  173 --
 .../AbstractKafkaSinglePortInputOperator.java      |   81 -
 .../contrib/kafka/HighlevelKafkaConsumer.java      |  236 --
 .../datatorrent/contrib/kafka/KafkaConsumer.java   |  550 ----
 .../contrib/kafka/KafkaJsonEncoder.java            |   50 -
 .../contrib/kafka/KafkaMetadataUtil.java           |  220 --
 .../datatorrent/contrib/kafka/KafkaPartition.java  |  134 -
 .../KafkaSinglePortByteArrayInputOperator.java     |   51 -
 .../kafka/KafkaSinglePortOutputOperator.java       |   74 -
 .../kafka/KafkaSinglePortStringInputOperator.java  |   58 -
 .../datatorrent/contrib/kafka/OffsetManager.java   |   53 -
 .../contrib/kafka/POJOKafkaOutputOperator.java     |  263 --
 .../contrib/kafka/SimpleKafkaConsumer.java         |  556 ----
 .../datatorrent/contrib/kafka/package-info.java    |   22 -
 .../kinesis/AbstractKinesisInputOperator.java      |  745 ------
 .../kinesis/AbstractKinesisOutputOperator.java     |  286 --
 .../kinesis/KinesisByteArrayInputOperator.java     |   52 -
 .../kinesis/KinesisByteArrayOutputOperator.java    |   45 -
 .../contrib/kinesis/KinesisConsumer.java           |  345 ---
 .../kinesis/KinesisStringInputOperator.java        |   49 -
 .../kinesis/KinesisStringOutputOperator.java       |   41 -
 .../datatorrent/contrib/kinesis/KinesisUtil.java   |  144 -
 .../datatorrent/contrib/kinesis/ShardManager.java  |   53 -
 .../datatorrent/contrib/kinesis/package-info.java  |   20 -
 .../memcache/AbstractMemcacheInputOperator.java    |   36 -
 .../memcache/AbstractMemcacheOutputOperator.java   |   42 -
 .../memcache/MemcachePOJOOutputOperator.java       |   86 -
 .../contrib/memcache/MemcacheStore.java            |  178 --
 .../datatorrent/contrib/memcache/package-info.java |   23 -
 .../AbstractMemcacheInputOperator.java             |   36 -
 .../AbstractMemcacheOutputOperator.java            |   42 -
 .../contrib/memcache_whalin/MemcacheStore.java     |  161 --
 .../contrib/memcache_whalin/package-info.java      |   23 -
 .../memsql/AbstractMemsqlInputOperator.java        |   35 -
 .../memsql/AbstractMemsqlOutputOperator.java       |   35 -
 .../contrib/memsql/MemsqlPOJOInputOperator.java    |  436 ---
 .../contrib/memsql/MemsqlPOJOOutputOperator.java   |  295 ---
 .../datatorrent/contrib/memsql/MemsqlStore.java    |   39 -
 .../datatorrent/contrib/memsql/package-info.java   |   20 -
 .../mongodb/MongoDBArrayListOutputOperator.java    |  105 -
 .../contrib/mongodb/MongoDBConnectable.java        |  137 -
 .../mongodb/MongoDBHashMapOutputOperator.java      |  103 -
 .../contrib/mongodb/MongoDBInputOperator.java      |  154 --
 .../contrib/mongodb/MongoDBOutputOperator.java     |  520 ----
 .../contrib/mongodb/MongoDBPOJOOutputOperator.java |  210 --
 .../datatorrent/contrib/mongodb/package-info.java  |   23 -
 .../contrib/mqtt/AbstractMqttInputOperator.java    |  236 --
 .../contrib/mqtt/AbstractMqttOutputOperator.java   |  108 -
 .../mqtt/AbstractSinglePortMqttInputOperator.java  |   74 -
 .../mqtt/AbstractSinglePortMqttOutputOperator.java |   67 -
 .../datatorrent/contrib/mqtt/MqttClientConfig.java |  305 ---
 .../com/datatorrent/contrib/mqtt/package-info.java |   23 -
 .../contrib/nifi/AbstractNiFiInputOperator.java    |  214 --
 .../contrib/nifi/AbstractNiFiOutputOperator.java   |  189 --
 .../nifi/AbstractNiFiSinglePortInputOperator.java  |   85 -
 .../datatorrent/contrib/nifi/NiFiDataPacket.java   |   44 -
 .../contrib/nifi/NiFiDataPacketBuilder.java        |   35 -
 .../contrib/nifi/NiFiSinglePortInputOperator.java  |   73 -
 .../contrib/nifi/NiFiSinglePortOutputOperator.java |  128 -
 .../contrib/nifi/StandardNiFiDataPacket.java       |   61 -
 .../contrib/parquet/AbstractParquetFileReader.java |  124 -
 .../contrib/parquet/ParquetFilePOJOReader.java     |  282 --
 .../contrib/parser/AbstractCsvParser.java          |  399 ---
 .../contrib/parser/CellProcessorBuilder.java       |  458 ----
 .../com/datatorrent/contrib/parser/CsvParser.java  |  289 --
 .../contrib/parser/DelimitedSchema.java            |  264 --
 .../contrib/parser/FixedWidthParser.java           |  495 ----
 .../contrib/parser/FixedWidthSchema.java           |  381 ---
 .../com/datatorrent/contrib/parser/JsonParser.java |  247 --
 .../datatorrent/contrib/parser/RegexParser.java    |  234 --
 .../com/datatorrent/contrib/parser/Schema.java     |  178 --
 .../datatorrent/contrib/parser/package-info.java   |   20 -
 .../datatorrent/contrib/r/REngineConnectable.java  |  183 --
 .../main/java/com/datatorrent/contrib/r/RMax.java  |  167 --
 .../main/java/com/datatorrent/contrib/r/RMin.java  |  163 --
 .../java/com/datatorrent/contrib/r/RScript.java    |  437 ---
 .../datatorrent/contrib/r/RStandardDeviation.java  |  158 --
 .../com/datatorrent/contrib/r/package-info.java    |   20 -
 .../rabbitmq/AbstractRabbitMQInputOperator.java    |  410 ---
 .../rabbitmq/AbstractRabbitMQOutputOperator.java   |  170 --
 .../AbstractSinglePortRabbitMQInputOperator.java   |   76 -
 .../AbstractSinglePortRabbitMQOutputOperator.java  |   72 -
 .../contrib/rabbitmq/RabbitMQInputOperator.java    |   38 -
 .../contrib/rabbitmq/RabbitMQOutputOperator.java   |   51 -
 .../datatorrent/contrib/rabbitmq/package-info.java |   23 -
 .../AbstractRedisAggregateOutputOperator.java      |   41 -
 .../contrib/redis/AbstractRedisInputOperator.java  |  262 --
 .../datatorrent/contrib/redis/LettuceStore.java    |  290 --
 .../datatorrent/contrib/redis/NumberSummation.java |  140 -
 .../redis/RedisKeyValPairOutputOperator.java       |   67 -
 .../contrib/redis/RedisKeyValueInputOperator.java  |   68 -
 .../redis/RedisMapAsValueInputOperator.java        |   57 -
 .../contrib/redis/RedisMapOutputOperator.java      |   66 -
 ...disNumberSummationKeyValPairOutputOperator.java |   56 -
 .../RedisNumberSummationMapOutputOperator.java     |   56 -
 .../contrib/redis/RedisPOJOInputOperator.java      |  214 --
 .../contrib/redis/RedisPOJOOutputOperator.java     |  159 --
 .../com/datatorrent/contrib/redis/RedisStore.java  |  375 ---
 .../datatorrent/contrib/redis/package-info.java    |   23 -
 .../contrib/romesyndication/RomeFeedEntry.java     |  101 -
 .../romesyndication/RomeStreamProvider.java        |   41 -
 .../romesyndication/RomeSyndicationOperator.java   |  232 --
 .../contrib/romesyndication/package-info.java      |   23 -
 .../com/datatorrent/contrib/ruby/RubyOperator.java |  136 -
 .../contrib/solr/AbstractSolrInputOperator.java    |  156 --
 .../contrib/solr/AbstractSolrOutputOperator.java   |  162 --
 .../contrib/solr/CloudSolrServerConnector.java     |   77 -
 .../solr/ConcurrentUpdateSolrServerConnector.java  |  131 -
 .../contrib/solr/HttpSolrServerConnector.java      |   58 -
 .../contrib/solr/LBHttpSolrServerConnector.java    |   95 -
 .../contrib/solr/SolrInputOperator.java            |   72 -
 .../contrib/solr/SolrOutputOperator.java           |   48 -
 .../contrib/solr/SolrServerConnector.java          |   69 -
 .../com/datatorrent/contrib/solr/package-info.java |   20 -
 .../splunk/AbstractSplunkInputOperator.java        |  124 -
 .../contrib/splunk/SplunkInputFromForwarder.java   |  110 -
 .../contrib/splunk/SplunkInputOperator.java        |   55 -
 .../datatorrent/contrib/splunk/SplunkStore.java    |  130 -
 .../contrib/splunk/SplunkTcpOutputOperator.java    |  115 -
 .../datatorrent/contrib/splunk/package-info.java   |   20 -
 .../contrib/sqlite/SqliteStreamOperator.java       |  187 --
 .../datatorrent/contrib/sqlite/package-info.java   |   23 -
 .../contrib/twitter/TwitterSampleInput.java        |  437 ---
 .../zmq/AbstractBaseZeroMQInputOperator.java       |  183 --
 .../zmq/AbstractBaseZeroMQOutputOperator.java      |  122 -
 .../zmq/AbstractSinglePortZeroMQInputOperator.java |   75 -
 .../AbstractSinglePortZeroMQOutputOperator.java    |   75 -
 .../SimpleSinglePortZeroMQPullInputOperator.java   |   84 -
 ...pleSinglePortZeroMQPullStringInputOperator.java |   49 -
 .../contrib/zmq/ZeroMQInputOperator.java           |   37 -
 .../contrib/zmq/ZeroMQOutputOperator.java          |   38 -
 .../com/datatorrent/contrib/zmq/package-info.java  |   23 -
 .../accumulo/AbstractAccumuloInputOperator.java    |   66 +
 .../accumulo/AbstractAccumuloOutputOperator.java   |  125 +
 .../malhar/contrib/accumulo/AccumuloStore.java     |  236 ++
 .../contrib/accumulo/AccumuloWindowStore.java      |  219 ++
 .../apex/malhar/contrib/accumulo/package-info.java |   20 +
 .../aerospike/AbstractAerospikeGetOperator.java    |   92 +
 ...stractAerospikeNonTransactionalPutOperator.java |   80 +
 .../AbstractAerospikeTransactionalPutOperator.java |   87 +
 .../AerospikePOJONonTransactionalPutOperator.java  |  100 +
 .../AerospikePOJOTransactionalPutOperator.java     |   94 +
 .../malhar/contrib/aerospike/AerospikeStore.java   |  141 +
 .../aerospike/AerospikeTransactionalStore.java     |  232 ++
 .../malhar/contrib/aerospike/package-info.java     |   20 +
 .../contrib/apachelog/ApacheLogInputGenerator.java |  361 +++
 .../contrib/apachelog/ApplicationLocalLog.java     |   65 +
 .../contrib/apachelog/ApplicationLogGenerator.java |   94 +
 .../malhar/contrib/apachelog/GeoIPExtractor.java   |   98 +
 .../contrib/apachelog/TimestampExtractor.java      |   78 +
 .../contrib/apachelog/UserAgentExtractor.java      |  105 +
 .../malhar/contrib/apachelog/package-info.java     |   23 +
 .../malhar/contrib/apachelog/zmq/Application.java  |   86 +
 .../malhar/contrib/avro/AvroFileInputOperator.java |  171 ++
 .../malhar/contrib/avro/AvroFileToPojoModule.java  |   91 +
 .../apex/malhar/contrib/avro/AvroRecordHelper.java |  125 +
 .../apex/malhar/contrib/avro/AvroToPojo.java       |  413 +++
 .../apex/malhar/contrib/avro/PojoToAvro.java       |  274 ++
 .../cassandra/AbstractCassandraInputOperator.java  |  161 ++
 ...ractCassandraTransactionableOutputOperator.java |   99 +
 .../cassandra/AbstractUpsertOutputOperator.java    | 1037 ++++++++
 .../cassandra/CassandraPOJOInputOperator.java      |  403 +++
 .../cassandra/CassandraPOJOOutputOperator.java     |  394 +++
 .../contrib/cassandra/CassandraPojoUtils.java      |  319 +++
 .../CassandraPreparedStatementGenerator.java       |  289 ++
 .../malhar/contrib/cassandra/CassandraStore.java   |  213 ++
 .../cassandra/CassandraTransactionalStore.java     |  242 ++
 .../contrib/cassandra/ConnectionStateManager.java  |  485 ++++
 .../contrib/cassandra/UpsertExecutionContext.java  |  212 ++
 .../malhar/contrib/cassandra/package-info.java     |   20 +
 .../couchbase/AbstractCouchBaseInputOperator.java  |  159 ++
 .../couchbase/AbstractCouchBaseOutputOperator.java |  200 ++
 .../couchbase/AbstractCouchBaseSetOperator.java    |   36 +
 .../contrib/couchbase/CouchBaseJSONSerializer.java |   52 +
 .../couchbase/CouchBasePOJOInputOperator.java      |  217 ++
 .../contrib/couchbase/CouchBaseSerializer.java     |   28 +
 .../malhar/contrib/couchbase/CouchBaseStore.java   |  268 ++
 .../contrib/couchbase/CouchBaseWindowStore.java    |  195 ++
 .../couchbase/CouchbasePOJOSetOperator.java        |   95 +
 .../malhar/contrib/couchbase/package-info.java     |   20 +
 .../couchdb/AbstractCouchDBInputOperator.java      |  141 +
 .../couchdb/AbstractCouchDBOutputOperator.java     |   56 +
 .../couchdb/AbstractMapBasedInputOperator.java     |   54 +
 .../contrib/couchdb/CouchDBPOJOInputOperator.java  |  269 ++
 .../contrib/couchdb/CouchDBPOJOOutputOperator.java |   72 +
 .../apex/malhar/contrib/couchdb/CouchDbStore.java  |  196 ++
 .../couchdb/MapBasedCouchDbOutputOperator.java     |   41 +
 .../apex/malhar/contrib/couchdb/package-info.java  |   20 +
 .../AbstractElasticSearchInputOperator.java        |  100 +
 .../AbstractElasticSearchOutputOperator.java       |  199 ++
 .../elasticsearch/ElasticSearchConnectable.java    |  130 +
 .../ElasticSearchMapInputOperator.java             |  110 +
 .../ElasticSearchMapOutputOperator.java            |  132 +
 .../ElasticSearchPercolatorOperator.java           |   92 +
 .../ElasticSearchPercolatorStore.java              |   81 +
 .../malhar/contrib/elasticsearch/package-info.java |   20 +
 .../malhar/contrib/enrich/AbstractEnricher.java    |  351 +++
 .../apex/malhar/contrib/enrich/BackendLoader.java  |   43 +
 .../malhar/contrib/enrich/DelimitedFSLoader.java   |  166 ++
 .../apex/malhar/contrib/enrich/FSLoader.java       |  228 ++
 .../malhar/contrib/enrich/FixedWidthFSLoader.java  |  271 ++
 .../apex/malhar/contrib/enrich/JDBCLoader.java     |  203 ++
 .../apex/malhar/contrib/enrich/JsonFSLoader.java   |   76 +
 .../apex/malhar/contrib/enrich/MapEnricher.java    |  140 +
 .../contrib/enrich/NullValuesCacheManager.java     |   61 +
 .../apex/malhar/contrib/enrich/POJOEnricher.java   |  290 ++
 .../apex/malhar/contrib/enrich/ReadOnlyBackup.java |   62 +
 .../malhar/contrib/formatter/CsvFormatter.java     |  221 ++
 .../contrib/geode/AbstractGeodeInputOperator.java  |   45 +
 .../contrib/geode/AbstractGeodeOutputOperator.java |   46 +
 .../malhar/contrib/geode/GeodeCheckpointStore.java |  330 +++
 .../contrib/geode/GeodeKeyValueStorageAgent.java   |   65 +
 .../contrib/geode/GeodePOJOOutputOperator.java     |   71 +
 .../apex/malhar/contrib/geode/GeodeStore.java      |  298 +++
 .../malhar/contrib/geode/RegionCreateFunction.java |   82 +
 .../hbase/AbstractHBaseAppendOutputOperator.java   |   85 +
 .../contrib/hbase/AbstractHBaseOutputOperator.java |   88 +
 .../hbase/AbstractHBasePutOutputOperator.java      |   76 +
 .../AbstractHBaseWindowAppendOutputOperator.java   |  117 +
 .../hbase/AbstractHBaseWindowOutputOperator.java   |   98 +
 .../AbstractHBaseWindowPutOutputOperator.java      |  105 +
 .../contrib/hbase/HBaseCsvMappingPutOperator.java  |  152 ++
 .../apex/malhar/contrib/hbase/HBaseFieldInfo.java  |   98 +
 .../contrib/hbase/HBaseFieldValueGenerator.java    |   61 +
 .../malhar/contrib/hbase/HBaseGetOperator.java     |   81 +
 .../malhar/contrib/hbase/HBaseInputOperator.java   |   37 +
 .../hbase/HBaseNameValueCsvPutOperator.java        |  174 ++
 .../malhar/contrib/hbase/HBaseOperatorBase.java    |  137 +
 .../contrib/hbase/HBasePOJOInputOperator.java      |  188 ++
 .../malhar/contrib/hbase/HBasePOJOPutOperator.java |   96 +
 .../malhar/contrib/hbase/HBaseScanOperator.java    |  245 ++
 .../apex/malhar/contrib/hbase/HBaseStore.java      |  423 +++
 .../malhar/contrib/hbase/HBaseWindowStore.java     |  228 ++
 .../apex/malhar/contrib/hbase/OutputAdapter.java   |   84 +
 .../apex/malhar/contrib/hbase/package-info.java    |   23 +
 .../apex/malhar/contrib/jython/PythonOperator.java |  109 +
 .../apex/malhar/contrib/jython/package-info.java   |   20 +
 .../AbstractExactlyOnceKafkaOutputOperator.java    |  193 ++
 .../contrib/kafka/AbstractKafkaInputOperator.java  |  885 +++++++
 .../contrib/kafka/AbstractKafkaOutputOperator.java |  175 ++
 .../AbstractKafkaSinglePortInputOperator.java      |   81 +
 .../contrib/kafka/HighlevelKafkaConsumer.java      |  234 ++
 .../apex/malhar/contrib/kafka/KafkaConsumer.java   |  554 ++++
 .../malhar/contrib/kafka/KafkaJsonEncoder.java     |   50 +
 .../malhar/contrib/kafka/KafkaMetadataUtil.java    |  218 ++
 .../apex/malhar/contrib/kafka/KafkaPartition.java  |  140 +
 .../KafkaSinglePortByteArrayInputOperator.java     |   49 +
 .../kafka/KafkaSinglePortOutputOperator.java       |   74 +
 .../kafka/KafkaSinglePortStringInputOperator.java  |   56 +
 .../apex/malhar/contrib/kafka/OffsetManager.java   |   53 +
 .../contrib/kafka/POJOKafkaOutputOperator.java     |  265 ++
 .../malhar/contrib/kafka/SimpleKafkaConsumer.java  |  560 ++++
 .../apex/malhar/contrib/kafka/package-info.java    |   22 +
 .../kinesis/AbstractKinesisInputOperator.java      |  739 ++++++
 .../kinesis/AbstractKinesisOutputOperator.java     |  283 ++
 .../kinesis/KinesisByteArrayInputOperator.java     |   51 +
 .../kinesis/KinesisByteArrayOutputOperator.java    |   45 +
 .../malhar/contrib/kinesis/KinesisConsumer.java    |  355 +++
 .../kinesis/KinesisStringInputOperator.java        |   47 +
 .../kinesis/KinesisStringOutputOperator.java       |   42 +
 .../apex/malhar/contrib/kinesis/KinesisUtil.java   |  147 ++
 .../apex/malhar/contrib/kinesis/ShardManager.java  |   53 +
 .../apex/malhar/contrib/kinesis/package-info.java  |   20 +
 .../memcache/AbstractMemcacheInputOperator.java    |   36 +
 .../memcache/AbstractMemcacheOutputOperator.java   |   41 +
 .../memcache/MemcachePOJOOutputOperator.java       |   84 +
 .../malhar/contrib/memcache/MemcacheStore.java     |  174 ++
 .../apex/malhar/contrib/memcache/package-info.java |   23 +
 .../AbstractMemcacheInputOperator.java             |   36 +
 .../AbstractMemcacheOutputOperator.java            |   41 +
 .../contrib/memcache_whalin/MemcacheStore.java     |  157 ++
 .../contrib/memcache_whalin/package-info.java      |   23 +
 .../memsql/AbstractMemsqlInputOperator.java        |   35 +
 .../memsql/AbstractMemsqlOutputOperator.java       |   35 +
 .../contrib/memsql/MemsqlPOJOInputOperator.java    |  416 +++
 .../contrib/memsql/MemsqlPOJOOutputOperator.java   |  298 +++
 .../apex/malhar/contrib/memsql/MemsqlStore.java    |   39 +
 .../apex/malhar/contrib/memsql/package-info.java   |   20 +
 .../misc/algo/AbstractStreamPatternMatcher.java    |    4 +-
 .../malhar/contrib/misc/algo/AllAfterMatchMap.java |    4 +-
 .../apex/malhar/contrib/misc/algo/DistinctMap.java |    6 +-
 .../malhar/contrib/misc/algo/FilterKeyVals.java    |    4 +-
 .../contrib/misc/algo/FilterKeysHashMap.java       |    4 +-
 .../malhar/contrib/misc/algo/FilterKeysMap.java    |    6 +-
 .../malhar/contrib/misc/algo/FirstMatchMap.java    |    4 +-
 .../apex/malhar/contrib/misc/algo/FirstN.java      |    3 +-
 .../malhar/contrib/misc/algo/FirstTillMatch.java   |    4 +-
 .../malhar/contrib/misc/algo/InsertSortDesc.java   |    5 +-
 .../apex/malhar/contrib/misc/algo/InvertIndex.java |    4 +-
 .../malhar/contrib/misc/algo/InvertIndexArray.java |    4 +-
 .../malhar/contrib/misc/algo/LastMatchMap.java     |    4 +-
 .../contrib/misc/algo/LeastFrequentKeyMap.java     |    8 +-
 .../misc/algo/LeastFrequentKeyValueMap.java        |    4 +-
 .../contrib/misc/algo/MostFrequentKeyMap.java      |    8 +-
 .../contrib/misc/algo/MostFrequentKeyValueMap.java |    4 +-
 .../apex/malhar/contrib/misc/algo/Sampler.java     |    4 +-
 .../malhar/contrib/misc/algo/package-info.java     |   20 +
 .../apex/malhar/contrib/misc/math/Change.java      |    3 +-
 .../apex/malhar/contrib/misc/math/ChangeAlert.java |    5 +-
 .../contrib/misc/math/ChangeAlertKeyVal.java       |    4 +-
 .../malhar/contrib/misc/math/ChangeAlertMap.java   |    2 +-
 .../malhar/contrib/misc/math/ChangeKeyVal.java     |    5 +-
 .../malhar/contrib/misc/math/CompareExceptMap.java |    5 +-
 .../apex/malhar/contrib/misc/math/CompareMap.java  |    3 +-
 .../apex/malhar/contrib/misc/math/CountKeyVal.java |    6 +-
 .../apex/malhar/contrib/misc/math/ExceptMap.java   |    5 +-
 .../apex/malhar/contrib/misc/math/Quotient.java    |    3 +-
 .../apex/malhar/contrib/misc/math/QuotientMap.java |    2 +-
 .../apex/malhar/contrib/misc/math/SumCountMap.java |    6 +-
 .../malhar/contrib/misc/math/package-info.java     |   20 +
 .../contrib/misc/streamquery/DeleteOperator.java   |    3 +-
 .../misc/streamquery/GroupByHavingOperator.java    |    7 +-
 .../misc/streamquery/InnerJoinOperator.java        |    5 +-
 .../contrib/misc/streamquery/SelectOperator.java   |    5 +-
 .../contrib/misc/streamquery/UpdateOperator.java   |    3 +-
 .../streamquery/condition/BetweenCondition.java    |    2 +-
 .../streamquery/condition/CompoundCondition.java   |    2 +-
 .../streamquery/condition/EqualValueCondition.java |    2 +-
 .../misc/streamquery/condition/InCondition.java    |    2 +-
 .../misc/streamquery/condition/LikeCondition.java  |    2 +-
 .../misc/streamquery/index/BinaryExpression.java   |    2 +-
 .../contrib/misc/streamquery/index/MidIndex.java   |    2 +-
 .../misc/streamquery/index/NegateExpression.java   |    2 +-
 .../misc/streamquery/index/RoundDoubleIndex.java   |    2 +-
 .../misc/streamquery/index/StringCaseIndex.java    |    2 +-
 .../misc/streamquery/index/StringLenIndex.java     |    2 +-
 .../misc/streamquery/index/SumExpression.java      |    2 +-
 .../misc/streamquery/index/UnaryExpression.java    |    2 +-
 .../mongodb/MongoDBArrayListOutputOperator.java    |  104 +
 .../malhar/contrib/mongodb/MongoDBConnectable.java |  136 +
 .../mongodb/MongoDBHashMapOutputOperator.java      |  104 +
 .../contrib/mongodb/MongoDBInputOperator.java      |  153 ++
 .../contrib/mongodb/MongoDBOutputOperator.java     |  514 ++++
 .../contrib/mongodb/MongoDBPOJOOutputOperator.java |  205 ++
 .../apex/malhar/contrib/mongodb/package-info.java  |   23 +
 .../contrib/mqtt/AbstractMqttInputOperator.java    |  236 ++
 .../contrib/mqtt/AbstractMqttOutputOperator.java   |  107 +
 .../mqtt/AbstractSinglePortMqttInputOperator.java  |   74 +
 .../mqtt/AbstractSinglePortMqttOutputOperator.java |   67 +
 .../apex/malhar/contrib/mqtt/MqttClientConfig.java |  305 +++
 .../apex/malhar/contrib/mqtt/package-info.java     |   23 +
 .../contrib/nifi/AbstractNiFiInputOperator.java    |  215 ++
 .../contrib/nifi/AbstractNiFiOutputOperator.java   |  189 ++
 .../nifi/AbstractNiFiSinglePortInputOperator.java  |   85 +
 .../apex/malhar/contrib/nifi/NiFiDataPacket.java   |   44 +
 .../malhar/contrib/nifi/NiFiDataPacketBuilder.java |   35 +
 .../contrib/nifi/NiFiSinglePortInputOperator.java  |   73 +
 .../contrib/nifi/NiFiSinglePortOutputOperator.java |  128 +
 .../contrib/nifi/StandardNiFiDataPacket.java       |   61 +
 .../contrib/parquet/AbstractParquetFileReader.java |  124 +
 .../contrib/parquet/ParquetFilePOJOReader.java     |  282 ++
 .../malhar/contrib/parser/AbstractCsvParser.java   |  395 +++
 .../contrib/parser/CellProcessorBuilder.java       |  457 ++++
 .../malhar/contrib/parser/CommonLogParser.java     |   48 +-
 .../apex/malhar/contrib/parser/CsvParser.java      |  289 ++
 .../malhar/contrib/parser/DelimitedSchema.java     |  264 ++
 .../malhar/contrib/parser/FixedWidthParser.java    |  495 ++++
 .../malhar/contrib/parser/FixedWidthSchema.java    |  382 +++
 .../apex/malhar/contrib/parser/JsonParser.java     |  247 ++
 .../apex/malhar/contrib/parser/LogParser.java      |   11 +-
 .../malhar/contrib/parser/LogSchemaDetails.java    |   18 +-
 .../apex/malhar/contrib/parser/RegexParser.java    |  234 ++
 .../apache/apex/malhar/contrib/parser/Schema.java  |  178 ++
 .../malhar/contrib/parser/StreamingJsonParser.java |   10 +-
 .../apex/malhar/contrib/r/REngineConnectable.java  |  183 ++
 .../org/apache/apex/malhar/contrib/r/RMax.java     |  169 ++
 .../org/apache/apex/malhar/contrib/r/RMin.java     |  165 ++
 .../org/apache/apex/malhar/contrib/r/RScript.java  |  442 ++++
 .../apex/malhar/contrib/r/RStandardDeviation.java  |  158 ++
 .../apache/apex/malhar/contrib/r/package-info.java |   20 +
 .../rabbitmq/AbstractRabbitMQInputOperator.java    |  414 +++
 .../rabbitmq/AbstractRabbitMQOutputOperator.java   |  170 ++
 .../AbstractSinglePortRabbitMQInputOperator.java   |   77 +
 .../AbstractSinglePortRabbitMQOutputOperator.java  |   71 +
 .../contrib/rabbitmq/RabbitMQInputOperator.java    |   38 +
 .../contrib/rabbitmq/RabbitMQOutputOperator.java   |   51 +
 .../apex/malhar/contrib/rabbitmq/package-info.java |   23 +
 .../AbstractRedisAggregateOutputOperator.java      |   41 +
 .../contrib/redis/AbstractRedisInputOperator.java  |  263 ++
 .../apex/malhar/contrib/redis/LettuceStore.java    |  289 ++
 .../apex/malhar/contrib/redis/NumberSummation.java |  126 +
 .../redis/RedisKeyValPairOutputOperator.java       |   68 +
 .../contrib/redis/RedisKeyValueInputOperator.java  |   68 +
 .../redis/RedisMapAsValueInputOperator.java        |   57 +
 .../contrib/redis/RedisMapOutputOperator.java      |   66 +
 ...disNumberSummationKeyValPairOutputOperator.java |   57 +
 .../RedisNumberSummationMapOutputOperator.java     |   56 +
 .../contrib/redis/RedisPOJOInputOperator.java      |  214 ++
 .../contrib/redis/RedisPOJOOutputOperator.java     |  159 ++
 .../apex/malhar/contrib/redis/RedisStore.java      |  369 +++
 .../apex/malhar/contrib/redis/package-info.java    |   23 +
 .../contrib/romesyndication/RomeFeedEntry.java     |  101 +
 .../romesyndication/RomeStreamProvider.java        |   41 +
 .../romesyndication/RomeSyndicationOperator.java   |  226 ++
 .../contrib/romesyndication/package-info.java      |   23 +
 .../apex/malhar/contrib/ruby/RubyOperator.java     |  138 +
 .../contrib/solr/AbstractSolrInputOperator.java    |  156 ++
 .../contrib/solr/AbstractSolrOutputOperator.java   |  162 ++
 .../contrib/solr/CloudSolrServerConnector.java     |   77 +
 .../solr/ConcurrentUpdateSolrServerConnector.java  |  131 +
 .../contrib/solr/HttpSolrServerConnector.java      |   58 +
 .../contrib/solr/LBHttpSolrServerConnector.java    |   95 +
 .../apache/apex/malhar}/contrib/solr/README.md     |    0
 .../malhar/contrib/solr/SolrInputOperator.java     |   72 +
 .../malhar/contrib/solr/SolrOutputOperator.java    |   48 +
 .../malhar/contrib/solr/SolrServerConnector.java   |   68 +
 .../apex/malhar/contrib/solr/package-info.java     |   20 +
 .../splunk/AbstractSplunkInputOperator.java        |  124 +
 .../contrib/splunk/SplunkInputFromForwarder.java   |  122 +
 .../malhar/contrib/splunk/SplunkInputOperator.java |   55 +
 .../apex/malhar/contrib/splunk/SplunkStore.java    |  134 +
 .../contrib/splunk/SplunkTcpOutputOperator.java    |  117 +
 .../apex/malhar/contrib/splunk/package-info.java   |   20 +
 .../contrib/sqlite/SqliteStreamOperator.java       |  182 ++
 .../apex/malhar/contrib/sqlite/package-info.java   |   23 +
 .../malhar/contrib/twitter/TwitterSampleInput.java |  443 ++++
 .../zmq/AbstractBaseZeroMQInputOperator.java       |  185 ++
 .../zmq/AbstractBaseZeroMQOutputOperator.java      |  122 +
 .../zmq/AbstractSinglePortZeroMQInputOperator.java |   76 +
 .../AbstractSinglePortZeroMQOutputOperator.java    |   75 +
 .../SimpleSinglePortZeroMQPullInputOperator.java   |   85 +
 ...pleSinglePortZeroMQPullStringInputOperator.java |   49 +
 .../malhar/contrib/zmq/ZeroMQInputOperator.java    |   38 +
 .../malhar/contrib/zmq/ZeroMQOutputOperator.java   |   39 +
 .../apex/malhar/contrib/zmq/package-info.java      |   23 +
 .../apex/malhar}/contrib/apachelog/agents.txt      |    0
 .../apex/malhar}/contrib/apachelog/ipaddress.txt   |    0
 .../apex/malhar}/contrib/apachelog/referers.txt    |    0
 .../apache/apex/malhar}/contrib/apachelog/urls.txt |    0
 .../accumulo/AccumuloInputOperatorTest.java        |  119 -
 .../accumulo/AccumuloOutputOperatorTest.java       |   76 -
 .../accumulo/AccumuloRowTupleGenerator.java        |   55 -
 .../contrib/accumulo/AccumuloTestHelper.java       |  192 --
 .../contrib/accumulo/AccumuloTuple.java            |   61 -
 .../contrib/accumulo/AccumuloTupleCollector.java   |   41 -
 .../contrib/aerospike/AerospikeOperatorTest.java   |  172 --
 ...rospikePOJONonTransactionalPutOperatorTest.java |   61 -
 .../AerospikePOJOTransactionalPutOperatorTest.java |   60 -
 .../contrib/aerospike/AerospikeTestUtils.java      |  235 --
 .../apachelog/ApacheLogInputGeneratorTest.java     |   63 -
 .../contrib/apachelog/ApplicationLocalLogTest.java |   48 -
 .../apachelog/ApplicationLogGeneratorTest.java     |   48 -
 .../contrib/apachelog/zmq/ApplicationTest.java     |   48 -
 .../contrib/avro/AvroFileInputOperatorTest.java    |  498 ----
 .../contrib/avro/AvroFileToPojoModuleTest.java     |  260 --
 .../datatorrent/contrib/avro/AvroToPojoTest.java   |  325 ---
 .../datatorrent/contrib/avro/PojoToAvroTest.java   |  236 --
 .../AbstractUpsertOutputOperatorCodecsTest.java    |  476 ----
 ...bstractUpsertOutputOperatorCompositePKTest.java |   99 -
 .../AbstractUpsertOutputOperatorCountersTest.java  |  120 -
 .../com/datatorrent/contrib/cassandra/Address.java |   82 -
 .../contrib/cassandra/AddressCodec.java            |   85 -
 .../CassandraLookupCacheBackedOperatorTest.java    |  120 -
 .../contrib/cassandra/CassandraOperatorTest.java   |  610 -----
 .../contrib/cassandra/CompositePrimaryKeyRow.java  |   98 -
 .../CompositePrimaryKeyUpdateOperator.java         |   58 -
 .../contrib/cassandra/CounterColumnTableEntry.java |   47 -
 .../cassandra/CounterColumnUpdatesOperator.java    |   54 -
 .../datatorrent/contrib/cassandra/FullName.java    |   52 -
 .../contrib/cassandra/FullNameCodec.java           |   80 -
 .../contrib/cassandra/TestInputPojo.java           |   64 -
 .../com/datatorrent/contrib/cassandra/User.java    |  130 -
 .../contrib/cassandra/UserUpsertOperator.java      |   97 -
 .../contrib/couchbase/CouchBaseGetTest.java        |  113 -
 .../couchbase/CouchBaseInputOperatorTest.java      |  193 --
 .../couchbase/CouchBaseOutputOperatorTest.java     |  226 --
 .../contrib/couchbase/CouchBasePOJOTest.java       |  163 --
 .../contrib/couchbase/CouchBaseSetTest.java        |  126 -
 .../contrib/couchbase/TestComplexPojoInput.java    |   65 -
 .../datatorrent/contrib/couchbase/TestPojo.java    |   62 -
 .../contrib/couchdb/CouchDBInputOperatorTest.java  |  102 -
 .../contrib/couchdb/CouchDBOutputOperatorTest.java |  252 --
 .../couchdb/CouchDBPOJOInputOperatorTest.java      |  130 -
 .../contrib/couchdb/CouchDBTestHelper.java         |  101 -
 .../couchdb/PagedCouchDBInputOperatorTest.java     |  119 -
 .../datatorrent/contrib/couchdb/TestInputPOJO.java |  134 -
 .../elasticsearch/ElasticSearchOperatorTest.java   |  185 --
 .../elasticsearch/ElasticSearchPercolateTest.java  |  162 --
 .../datatorrent/contrib/enrich/EmployeeOrder.java  |  114 -
 .../contrib/enrich/FileEnrichmentTest.java         |  236 --
 .../datatorrent/contrib/enrich/JDBCLoaderTest.java |  241 --
 .../contrib/enrich/MapEnricherTest.java            |  251 --
 .../java/com/datatorrent/contrib/enrich/Order.java |   71 -
 .../contrib/enrich/POJOEnricherTest.java           |  232 --
 .../contrib/formatter/CsvFormatterTest.java        |  181 --
 .../contrib/geode/GeodeCheckpointStoreTest.java    |  153 --
 .../geode/GeodeKeyValueStorageAgentTest.java       |  214 --
 .../contrib/geode/GeodeOperatorTest.java           |   69 -
 .../contrib/geode/GeodePOJOOperatorTest.java       |  102 -
 .../datatorrent/contrib/geode/GeodeStoreTest.java  |  110 -
 .../contrib/hbase/HBaseColTupleGenerator.java      |   55 -
 .../hbase/HBaseCsvMappingPutOperatorTest.java      |   73 -
 .../contrib/hbase/HBaseGetOperatorTest.java        |  124 -
 .../hbase/HBaseNameValueCsvPutOperatorTest.java    |   68 -
 .../contrib/hbase/HBasePOJOInputOperatorTest.java  |  206 --
 .../contrib/hbase/HBasePOJOPutOperatorTest.java    |  291 --
 .../contrib/hbase/HBaseRowStringGenerator.java     |   58 -
 .../contrib/hbase/HBaseRowTupleGenerator.java      |   55 -
 .../contrib/hbase/HBaseScanOperatorTest.java       |  122 -
 .../datatorrent/contrib/hbase/HBaseTestHelper.java |  156 --
 .../HBaseTransactionalAppendOperatorTest.java      |  107 -
 .../hbase/HBaseTransactionalPutOperatorTest.java   |  165 --
 .../com/datatorrent/contrib/hbase/HBaseTuple.java  |   73 -
 .../contrib/hbase/HBaseTupleCollector.java         |   47 -
 .../com/datatorrent/contrib/hbase/HBaseUtil.java   |   79 -
 .../contrib/helper/CollectorModule.java            |   62 -
 .../contrib/helper/MessageQueueTestHelper.java     |   69 -
 .../datatorrent/contrib/helper/SourceModule.java   |  102 -
 .../contrib/jython/PythonOperatorTest.java         |   64 -
 .../kafka/KafkaExactlyOnceOutputOperatorTest.java  |  199 --
 .../contrib/kafka/KafkaInputOperatorTest.java      |  501 ----
 .../contrib/kafka/KafkaOperatorTestBase.java       |  273 --
 .../contrib/kafka/KafkaOutputOperatorTest.java     |  253 --
 .../kafka/KafkaPartitionableInputOperatorTest.java |  199 --
 .../contrib/kafka/KafkaSimpleConsumer.java         |  111 -
 .../contrib/kafka/KafkaTestConsumer.java           |  140 -
 .../contrib/kafka/KafkaTestPartitioner.java        |   41 -
 .../contrib/kafka/KafkaTestProducer.java           |  158 --
 .../contrib/kafka/OffsetManagerTest.java           |  305 ---
 .../contrib/kafka/SimpleKakfaConsumerTest.java     |   50 -
 .../KinesisByteArrayOutputOperatorTest.java        |  145 -
 .../contrib/kinesis/KinesisInputOperatorTest.java  |  320 ---
 .../contrib/kinesis/KinesisOperatorTestBase.java   |   98 -
 .../contrib/kinesis/KinesisOutputOperatorTest.java |  160 --
 .../KinesisPartitionableInputOperatorTest.java     |  168 --
 .../kinesis/KinesisStringOutputOperatorTest.java   |  117 -
 .../contrib/kinesis/KinesisTestConsumer.java       |  201 --
 .../contrib/kinesis/KinesisTestProducer.java       |  122 -
 .../contrib/kinesis/ShardManagerTest.java          |  311 ---
 .../contrib/memcache/MemcacheOperatorTest.java     |   60 -
 .../contrib/memcache/MemcachePOJOOperatorTest.java |   99 -
 .../MemcacheWhalinOperatorTest.java                |   52 -
 .../memsql/AbstractMemsqlInputOperatorTest.java    |  238 --
 .../memsql/AbstractMemsqlOutputOperatorTest.java   |  241 --
 .../contrib/memsql/MemsqlInputOperator.java        |  160 --
 .../contrib/memsql/MemsqlStoreTest.java            |   32 -
 .../datatorrent/contrib/memsql/TestInputPojo.java  |   49 -
 .../contrib/mongodb/MongoDBInputOperatorTest.java  |   80 -
 .../contrib/mongodb/MongoDBOutputOperatorTest.java |  302 ---
 .../com/datatorrent/contrib/mongodb/TestPOJO.java  |  117 -
 .../contrib/mqtt/MqttInputOperatorTest.java        |  153 --
 .../contrib/mqtt/MqttOutputOperatorTest.java       |  188 --
 .../nifi/NiFiSinglePortInputOperatorTest.java      |  201 --
 .../nifi/NiFiSinglePortOutputOperatorTest.java     |  232 --
 .../nifi/demo/TestNiFiInputApplication.java        |   63 -
 .../nifi/demo/TestNiFiOutputApplication.java       |   85 -
 .../contrib/nifi/mock/MockDataPacket.java          |   58 -
 .../contrib/nifi/mock/MockSiteToSiteClient.java    |  102 -
 .../contrib/nifi/mock/MockTransaction.java         |  166 --
 .../contrib/parquet/ParquetFilePOJOReaderTest.java |  607 -----
 .../datatorrent/contrib/parser/CSVParserTest.java  |  245 --
 .../contrib/parser/CsvPOJOParserTest.java          |  592 -----
 .../datatorrent/contrib/parser/FixedWidthTest.java |  526 ----
 .../contrib/parser/JsonParserApplicationTest.java  |   93 -
 .../datatorrent/contrib/parser/JsonParserTest.java |  443 ----
 .../contrib/parser/RegexParserTest.java            |  261 --
 .../datatorrent/contrib/r/RMaxOperatorTest.java    |   76 -
 .../datatorrent/contrib/r/RMinOperatorTest.java    |   76 -
 .../r/RScriptLinearRegressionPredictorTest.java    |   78 -
 .../contrib/r/RScriptOperatorBooleanTest.java      |  102 -
 .../contrib/r/RScriptOperatorDoubleArrayTest.java  |   79 -
 .../contrib/r/RScriptOperatorIntTest.java          |   68 -
 .../contrib/r/RScriptOperatorRealTest.java         |   72 -
 .../contrib/r/RScriptOperatorStrTest.java          |   73 -
 .../contrib/r/RStandardDeviationOperatorTest.java  |   52 -
 .../rabbitmq/RabbitMQInputOperatorBenchmark.java   |   38 -
 .../rabbitmq/RabbitMQInputOperatorTest.java        |  236 --
 .../rabbitmq/RabbitMQOutputOperatorBenchmark.java  |   37 -
 .../rabbitmq/RabbitMQOutputOperatorTest.java       |  180 --
 .../contrib/redis/RedisInputOperatorTest.java      |  197 --
 .../contrib/redis/RedisOperatorTest.java           |   58 -
 .../contrib/redis/RedisPOJOOperatorTest.java       |  234 --
 .../RomeSyndicationOperatorTest.java               |  150 --
 .../datatorrent/contrib/ruby/RubyOperatorTest.java |   90 -
 .../splunk/SplunkInputFromForwarderTest.java       |   58 -
 .../contrib/splunk/SplunkInputOperatorTest.java    |   94 -
 .../splunk/SplunkTcpOutputOperatorTest.java        |  126 -
 .../util/FieldValueSerializableGenerator.java      |  131 -
 .../contrib/util/POJOTupleGenerateOperator.java    |  153 --
 .../com/datatorrent/contrib/util/TestPOJO.java     |  201 --
 .../contrib/util/TupleCacheOutputOperator.java     |   82 -
 .../contrib/util/TupleGenerateCacheOperator.java   |   55 -
 .../datatorrent/contrib/util/TupleGenerator.java   |   97 -
 .../contrib/zmq/ZeroMQInputOperatorBenchmark.java  |   32 -
 .../contrib/zmq/ZeroMQInputOperatorTest.java       |  127 -
 .../contrib/zmq/ZeroMQMessageGenerator.java        |   80 -
 .../contrib/zmq/ZeroMQMessageReceiver.java         |   93 -
 .../contrib/zmq/ZeroMQOutputOperatorBenchmark.java |   41 -
 .../contrib/zmq/ZeroMQOutputOperatorTest.java      |  122 -
 .../accumulo/AccumuloInputOperatorTest.java        |  124 +
 .../accumulo/AccumuloOutputOperatorTest.java       |   78 +
 .../accumulo/AccumuloRowTupleGenerator.java        |   58 +
 .../contrib/accumulo/AccumuloTestHelper.java       |  201 ++
 .../malhar/contrib/accumulo/AccumuloTuple.java     |   70 +
 .../contrib/accumulo/AccumuloTupleCollector.java   |   45 +
 .../contrib/aerospike/AerospikeOperatorTest.java   |  181 ++
 ...rospikePOJONonTransactionalPutOperatorTest.java |   58 +
 .../AerospikePOJOTransactionalPutOperatorTest.java |   59 +
 .../contrib/aerospike/AerospikeTestUtils.java      |  250 ++
 .../apachelog/ApacheLogInputGeneratorTest.java     |   63 +
 .../contrib/apachelog/ApplicationLocalLogTest.java |   50 +
 .../apachelog/ApplicationLogGeneratorTest.java     |   50 +
 .../contrib/apachelog/zmq/ApplicationTest.java     |   54 +
 .../contrib/avro/AvroFileInputOperatorTest.java    |  499 ++++
 .../contrib/avro/AvroFileToPojoModuleTest.java     |  260 ++
 .../apex/malhar/contrib/avro/AvroToPojoTest.java   |  325 +++
 .../apex/malhar/contrib/avro/PojoToAvroTest.java   |  237 ++
 .../AbstractUpsertOutputOperatorCodecsTest.java    |  477 ++++
 ...bstractUpsertOutputOperatorCompositePKTest.java |  100 +
 .../AbstractUpsertOutputOperatorCountersTest.java  |  122 +
 .../apex/malhar/contrib/cassandra/Address.java     |   82 +
 .../malhar/contrib/cassandra/AddressCodec.java     |   85 +
 .../CassandraLookupCacheBackedOperatorTest.java    |  118 +
 .../contrib/cassandra/CassandraOperatorTest.java   |  609 +++++
 .../contrib/cassandra/CompositePrimaryKeyRow.java  |   98 +
 .../CompositePrimaryKeyUpdateOperator.java         |   59 +
 .../contrib/cassandra/CounterColumnTableEntry.java |   47 +
 .../cassandra/CounterColumnUpdatesOperator.java    |   55 +
 .../apex/malhar/contrib/cassandra/FullName.java    |   52 +
 .../malhar/contrib/cassandra/FullNameCodec.java    |   80 +
 .../malhar/contrib/cassandra/TestInputPojo.java    |   65 +
 .../apache/apex/malhar/contrib/cassandra/User.java |  130 +
 .../contrib/cassandra/UserUpsertOperator.java      |   98 +
 .../malhar/contrib/couchbase/CouchBaseGetTest.java |  115 +
 .../couchbase/CouchBaseInputOperatorTest.java      |  191 ++
 .../couchbase/CouchBaseOutputOperatorTest.java     |  226 ++
 .../contrib/couchbase/CouchBasePOJOTest.java       |  158 ++
 .../malhar/contrib/couchbase/CouchBaseSetTest.java |  125 +
 .../contrib/couchbase/TestComplexPojoInput.java    |   65 +
 .../apex/malhar/contrib/couchbase/TestPojo.java    |   63 +
 .../contrib/couchdb/CouchDBInputOperatorTest.java  |  102 +
 .../contrib/couchdb/CouchDBOutputOperatorTest.java |  251 ++
 .../couchdb/CouchDBPOJOInputOperatorTest.java      |  130 +
 .../malhar/contrib/couchdb/CouchDBTestHelper.java  |  101 +
 .../couchdb/PagedCouchDBInputOperatorTest.java     |  118 +
 .../apex/malhar/contrib/couchdb/TestInputPOJO.java |  134 +
 .../elasticsearch/ElasticSearchOperatorTest.java   |  187 ++
 .../elasticsearch/ElasticSearchPercolateTest.java  |  160 ++
 .../apex/malhar/contrib/enrich/EmployeeOrder.java  |  114 +
 .../malhar/contrib/enrich/FileEnrichmentTest.java  |  235 ++
 .../apex/malhar/contrib/enrich/JDBCLoaderTest.java |  242 ++
 .../malhar/contrib/enrich/MapEnricherTest.java     |  251 ++
 .../apache/apex/malhar/contrib/enrich/Order.java   |   71 +
 .../malhar/contrib/enrich/POJOEnricherTest.java    |  232 ++
 .../malhar/contrib/formatter/CsvFormatterTest.java |  181 ++
 .../contrib/geode/GeodeCheckpointStoreTest.java    |  153 ++
 .../geode/GeodeKeyValueStorageAgentTest.java       |  214 ++
 .../malhar/contrib/geode/GeodeOperatorTest.java    |   69 +
 .../contrib/geode/GeodePOJOOperatorTest.java       |  103 +
 .../apex/malhar/contrib/geode/GeodeStoreTest.java  |  110 +
 .../contrib/hbase/HBaseColTupleGenerator.java      |   55 +
 .../hbase/HBaseCsvMappingPutOperatorTest.java      |   75 +
 .../malhar/contrib/hbase/HBaseGetOperatorTest.java |  123 +
 .../hbase/HBaseNameValueCsvPutOperatorTest.java    |   65 +
 .../contrib/hbase/HBasePOJOInputOperatorTest.java  |  199 ++
 .../contrib/hbase/HBasePOJOPutOperatorTest.java    |  273 ++
 .../contrib/hbase/HBaseRowStringGenerator.java     |   58 +
 .../contrib/hbase/HBaseRowTupleGenerator.java      |   55 +
 .../contrib/hbase/HBaseScanOperatorTest.java       |  122 +
 .../apex/malhar/contrib/hbase/HBaseTestHelper.java |  166 ++
 .../HBaseTransactionalAppendOperatorTest.java      |   96 +
 .../hbase/HBaseTransactionalPutOperatorTest.java   |  186 ++
 .../apex/malhar/contrib/hbase/HBaseTuple.java      |   73 +
 .../malhar/contrib/hbase/HBaseTupleCollector.java  |   46 +
 .../apex/malhar/contrib/hbase/HBaseUtil.java       |   67 +
 .../malhar/contrib/helper/CollectorModule.java     |   60 +
 .../contrib/helper/MessageQueueTestHelper.java     |   68 +
 .../apex/malhar/contrib/helper/SourceModule.java   |  102 +
 .../malhar/contrib/jython/PythonOperatorTest.java  |   64 +
 .../kafka/KafkaExactlyOnceOutputOperatorTest.java  |  203 ++
 .../contrib/kafka/KafkaInputOperatorTest.java      |  503 ++++
 .../contrib/kafka/KafkaOperatorTestBase.java       |  275 ++
 .../contrib/kafka/KafkaOutputOperatorTest.java     |  257 ++
 .../kafka/KafkaPartitionableInputOperatorTest.java |  207 ++
 .../malhar/contrib/kafka/KafkaSimpleConsumer.java  |  110 +
 .../malhar/contrib/kafka/KafkaTestConsumer.java    |  140 +
 .../malhar/contrib/kafka/KafkaTestPartitioner.java |   42 +
 .../malhar/contrib/kafka/KafkaTestProducer.java    |  161 ++
 .../malhar/contrib/kafka/OffsetManagerTest.java    |  306 +++
 .../contrib/kafka/SimpleKakfaConsumerTest.java     |   51 +
 .../KinesisByteArrayOutputOperatorTest.java        |  148 ++
 .../contrib/kinesis/KinesisInputOperatorTest.java  |  320 +++
 .../contrib/kinesis/KinesisOperatorTestBase.java   |   92 +
 .../contrib/kinesis/KinesisOutputOperatorTest.java |  164 ++
 .../KinesisPartitionableInputOperatorTest.java     |  169 ++
 .../kinesis/KinesisStringOutputOperatorTest.java   |  116 +
 .../contrib/kinesis/KinesisTestConsumer.java       |  207 ++
 .../contrib/kinesis/KinesisTestProducer.java       |  125 +
 .../malhar/contrib/kinesis/ShardManagerTest.java   |  314 +++
 .../contrib/memcache/MemcacheOperatorTest.java     |   58 +
 .../contrib/memcache/MemcachePOJOOperatorTest.java |   93 +
 .../MemcacheWhalinOperatorTest.java                |   52 +
 .../memsql/AbstractMemsqlInputOperatorTest.java    |  235 ++
 .../memsql/AbstractMemsqlOutputOperatorTest.java   |  238 ++
 .../malhar/contrib/memsql/MemsqlInputOperator.java |  158 ++
 .../malhar/contrib/memsql/MemsqlStoreTest.java     |   32 +
 .../apex/malhar/contrib/memsql/TestInputPojo.java  |   49 +
 .../algo/AbstractStreamPatternMatcherTest.java     |    3 +-
 .../contrib/misc/algo/AllAfterMatchMapTest.java    |    2 +-
 .../malhar/contrib/misc/algo/DistinctMapTest.java  |    2 +-
 .../contrib/misc/algo/FilterKeyValsTest.java       |    2 +-
 .../contrib/misc/algo/FilterKeysHashMapTest.java   |    2 +-
 .../contrib/misc/algo/FilterKeysMapTest.java       |    2 +-
 .../contrib/misc/algo/FirstMatchMapTest.java       |    2 +-
 .../apex/malhar/contrib/misc/algo/FirstNTest.java  |    2 +-
 .../contrib/misc/algo/FirstTillMatchTest.java      |    2 +-
 .../contrib/misc/algo/InsertSortDescTest.java      |    2 +-
 .../contrib/misc/algo/InvertIndexArrayTest.java    |    4 +-
 .../malhar/contrib/misc/algo/InvertIndexTest.java  |    4 +-
 .../malhar/contrib/misc/algo/LastMatchMapTest.java |    2 +-
 .../contrib/misc/algo/LeastFrequentKeyMapTest.java |    2 +-
 .../misc/algo/LeastFrequentKeyValueMapTest.java    |    2 +-
 .../malhar/contrib/misc/algo/MatchMapTest.java     |    6 +-
 .../contrib/misc/algo/MostFrequentKeyMapTest.java  |    2 +-
 .../misc/algo/MostFrequentKeyValueMapTest.java     |    2 +-
 .../apex/malhar/contrib/misc/algo/SamplerTest.java |    2 +-
 .../contrib/misc/math/ChangeAlertKeyValTest.java   |    4 +-
 .../contrib/misc/math/ChangeAlertMapTest.java      |    2 +-
 .../malhar/contrib/misc/math/ChangeAlertTest.java  |    4 +-
 .../malhar/contrib/misc/math/ChangeKeyValTest.java |    4 +-
 .../apex/malhar/contrib/misc/math/ChangeTest.java  |    2 +-
 .../contrib/misc/math/CompareExceptMapTest.java    |    2 +-
 .../malhar/contrib/misc/math/CompareMapTest.java   |    2 +-
 .../malhar/contrib/misc/math/CountKeyValTest.java  |    4 +-
 .../malhar/contrib/misc/math/ExceptMapTest.java    |    2 +-
 .../malhar/contrib/misc/math/QuotientMapTest.java  |    2 +-
 .../malhar/contrib/misc/math/SumCountMapTest.java  |    2 +-
 .../misc/streamquery/DeleteOperatorTest.java       |    3 +-
 .../streamquery/FullOuterJoinOperatorTest.java     |    9 +-
 .../misc/streamquery/GroupByOperatorTest.java      |    5 +-
 .../misc/streamquery/HavingOperatorTest.java       |    5 +-
 .../misc/streamquery/InnerJoinOperatorTest.java    |   10 +-
 .../streamquery/LeftOuterJoinOperatorTest.java     |    8 +-
 .../misc/streamquery/OrderByOperatorTest.java      |    4 +-
 .../streamquery/RightOuterJoinOperatorTest.java    |    8 +-
 .../misc/streamquery/SelectOperatorTest.java       |    5 +-
 .../misc/streamquery/SelectTopOperatorTest.java    |    2 +-
 .../misc/streamquery/UpdateOperatorTest.java       |    3 +-
 .../streamquery/advanced/BetweenConditionTest.java |    5 +-
 .../advanced/CompoundConditionTest.java            |    5 +-
 .../misc/streamquery/advanced/InConditionTest.java |    5 +-
 .../streamquery/advanced/LikeConditionTest.java    |    5 +-
 .../misc/streamquery/advanced/NegateIndexTest.java |    3 +-
 .../streamquery/advanced/SelectAverageTest.java    |    3 +-
 .../misc/streamquery/advanced/SelectCountTest.java |    3 +-
 .../streamquery/advanced/SelectFirstLastTest.java  |    3 +-
 .../streamquery/advanced/SelectMaxMinTest.java     |    3 +-
 .../misc/streamquery/advanced/SumIndexTest.java    |    3 +-
 .../contrib/mongodb/MongoDBInputOperatorTest.java  |   78 +
 .../contrib/mongodb/MongoDBOutputOperatorTest.java |  298 +++
 .../apex/malhar/contrib/mongodb/TestPOJO.java      |  117 +
 .../malhar/contrib/mqtt/MqttInputOperatorTest.java |  148 ++
 .../contrib/mqtt/MqttOutputOperatorTest.java       |  182 ++
 .../nifi/NiFiSinglePortInputOperatorTest.java      |  202 ++
 .../nifi/NiFiSinglePortOutputOperatorTest.java     |  227 ++
 .../nifi/demo/TestNiFiInputApplication.java        |   63 +
 .../nifi/demo/TestNiFiOutputApplication.java       |   86 +
 .../malhar/contrib/nifi/mock/MockDataPacket.java   |   58 +
 .../contrib/nifi/mock/MockSiteToSiteClient.java    |  102 +
 .../malhar/contrib/nifi/mock/MockTransaction.java  |  166 ++
 .../contrib/parquet/ParquetFilePOJOReaderTest.java |  606 +++++
 .../apex/malhar/contrib/parser/CSVParserTest.java  |  245 ++
 .../malhar/contrib/parser/CommonLogParserTest.java |    3 +-
 .../malhar/contrib/parser/CsvPOJOParserTest.java   |  592 +++++
 .../apex/malhar/contrib/parser/FixedWidthTest.java |  526 ++++
 .../contrib/parser/JsonParserApplicationTest.java  |   93 +
 .../apex/malhar/contrib/parser/JsonParserTest.java |  443 ++++
 .../apex/malhar/contrib/parser/LogParserTest.java  |   36 +-
 .../malhar/contrib/parser/RegexParserTest.java     |  259 ++
 .../contrib/parser/StreamingJsonParserTest.java    |    8 +-
 .../apex/malhar/contrib/r/RMaxOperatorTest.java    |   76 +
 .../apex/malhar/contrib/r/RMinOperatorTest.java    |   76 +
 .../r/RScriptLinearRegressionPredictorTest.java    |   78 +
 .../contrib/r/RScriptOperatorBooleanTest.java      |  102 +
 .../contrib/r/RScriptOperatorDoubleArrayTest.java  |   79 +
 .../malhar/contrib/r/RScriptOperatorIntTest.java   |   68 +
 .../malhar/contrib/r/RScriptOperatorRealTest.java  |   72 +
 .../malhar/contrib/r/RScriptOperatorStrTest.java   |   73 +
 .../contrib/r/RStandardDeviationOperatorTest.java  |   52 +
 .../rabbitmq/RabbitMQInputOperatorBenchmark.java   |   38 +
 .../rabbitmq/RabbitMQInputOperatorTest.java        |  236 ++
 .../rabbitmq/RabbitMQOutputOperatorBenchmark.java  |   37 +
 .../rabbitmq/RabbitMQOutputOperatorTest.java       |  186 ++
 .../contrib/redis/RedisInputOperatorTest.java      |  198 ++
 .../malhar/contrib/redis/RedisOperatorTest.java    |   58 +
 .../contrib/redis/RedisPOJOOperatorTest.java       |  236 ++
 .../RomeSyndicationOperatorTest.java               |  149 ++
 .../apex/malhar/contrib/ruby/RubyOperatorTest.java |   90 +
 .../splunk/SplunkInputFromForwarderTest.java       |   59 +
 .../contrib/splunk/SplunkInputOperatorTest.java    |   95 +
 .../splunk/SplunkTcpOutputOperatorTest.java        |  126 +
 .../util/FieldValueSerializableGenerator.java      |  123 +
 .../contrib/util/POJOTupleGenerateOperator.java    |  151 ++
 .../apache/apex/malhar/contrib/util/TestPOJO.java  |  207 ++
 .../contrib/util/TupleCacheOutputOperator.java     |   81 +
 .../contrib/util/TupleGenerateCacheOperator.java   |   54 +
 .../apex/malhar/contrib/util/TupleGenerator.java   |   90 +
 .../contrib/zmq/ZeroMQInputOperatorBenchmark.java  |   33 +
 .../contrib/zmq/ZeroMQInputOperatorTest.java       |  128 +
 .../malhar/contrib/zmq/ZeroMQMessageGenerator.java |   78 +
 .../malhar/contrib/zmq/ZeroMQMessageReceiver.java  |   90 +
 .../contrib/zmq/ZeroMQOutputOperatorBenchmark.java |   41 +
 .../contrib/zmq/ZeroMQOutputOperatorTest.java      |  115 +
 examples/csvformatter/pom.xml                      |    2 +-
 .../apex/examples/csvformatter/Application.java    |    6 +-
 .../examples/csvformatter/HDFSOutputOperator.java  |    3 +-
 examples/dedup/pom.xml                             |    2 +-
 .../apache/apex/examples/dedup/Application.java    |    2 +-
 examples/distributedistinct/pom.xml                |    2 +-
 .../examples/distributeddistinct/Application.java  |   10 +-
 .../distributeddistinct/CountVerifier.java         |    3 +-
 .../IntegerUniqueValueCountAppender.java           |    4 +-
 .../distributeddistinct/RandomKeyValGenerator.java |    5 +-
 .../distributeddistinct/StatefulApplication.java   |    8 +-
 .../UniqueValueCountAppender.java                  |    7 +-
 .../DistributedDistinctTest.java                   |    8 +-
 .../StatefulUniqueCountTest.java                   |    5 +-
 examples/dynamic-partition/pom.xml                 |    2 +-
 .../java/org/apache/apex/examples/dynamic/App.java |    3 +-
 examples/echoserver/pom.xml                        |    2 +-
 examples/enricher/pom.xml                          |    2 +-
 .../examples/enricher/EnricherAppWithJSONFile.java |    6 +-
 .../apex/examples/enricher/LineOutputOperator.java |    2 +-
 examples/exactly-once/pom.xml                      |    2 +-
 .../exactlyonce/ExactlyOnceFileOutputApp.java      |    6 +-
 .../exactlyonce/ExactlyOnceJdbcOutputApp.java      |   10 +-
 .../exactlyonce/ExactlyOnceJdbcOutputTest.java     |    2 +-
 examples/filter/pom.xml                            |    2 +-
 .../apache/apex/examples/filter/Application.java   |    6 +-
 examples/frauddetect/pom.xml                       |    2 +-
 .../apex/examples/frauddetect/Application.java     |   14 +-
 .../frauddetect/AverageAlertingOperator.java       |    3 +-
 .../apex/examples/frauddetect/BankIdNumberKey.java |    2 +-
 .../frauddetect/BankIdNumberSamplerOperator.java   |    4 +-
 .../CreditCardAmountSamplerOperator.java           |    2 +-
 .../MerchantTransactionBucketOperator.java         |    2 +-
 .../frauddetect/SlidingWindowSumKeyVal.java        |    6 +-
 .../frauddetect/SlidingWindowSumObject.java        |    3 +-
 .../frauddetect/TransactionStatsAggregator.java    |    4 +-
 .../operator/HdfsStringOutputOperator.java         |    3 +-
 examples/ftp/pom.xml                               |    2 +-
 .../org/apache/apex/examples/ftp/Application.java  |    2 +-
 examples/highlevelapi/pom.xml                      |    2 +-
 .../malhar/stream/sample/MinimalWordCount.java     |    2 +-
 .../malhar/stream/sample/WindowedWordCount.java    |    2 +-
 .../stream/sample/complete/AutoComplete.java       |    2 +-
 .../sample/complete/StreamingWordExtract.java      |    6 +-
 .../sample/complete/TopWikipediaSessions.java      |    2 +-
 .../stream/sample/complete/TrafficRoutes.java      |    2 +-
 .../sample/complete/TwitterAutoComplete.java       |    4 +-
 .../sample/cookbook/CombinePerKeyExamples.java     |    2 +-
 .../stream/sample/cookbook/MaxPerKeyExamples.java  |   14 +-
 .../stream/sample/cookbook/TriggerExample.java     |    3 +-
 .../stream/sample/WindowedWordCountTest.java       |    2 +-
 .../sample/complete/StreamingWordExtractTest.java  |    2 +-
 .../stream/sample/complete/TrafficRoutesTest.java  |    2 +-
 .../sample/cookbook/MaxPerKeyExamplesTest.java     |    2 +-
 examples/iteration/pom.xml                         |    2 +-
 .../apex/examples/iteration/Application.java       |    2 +-
 examples/jdbc/pom.xml                              |    2 +-
 .../FileToJdbcApp/FileToJdbcCsvParser.java         |   10 +-
 .../FileToJdbcApp/FileToJdbcCustomParser.java      |    6 +-
 .../JdbcIngest/FileLineOutputOperator.java         |    2 +-
 .../apex/examples/JdbcIngest/JdbcHDFSApp.java      |    8 +-
 .../examples/JdbcIngest/JdbcPollerApplication.java |    8 +-
 .../apex/examples/JdbcToJdbc/JdbcToJdbcApp.java    |   22 +-
 .../examples/FileToJdbcApp/ApplicationTest.java    |    2 +-
 .../apex/examples/JdbcToJdbc/JdbcOperatorTest.java |    6 +-
 examples/kafka/pom.xml                             |    2 +-
 .../kafka/exactlyonceoutput/ValidationToFile.java  |    3 +-
 .../examples/kafka/hdfs2kafka/Application.java     |    2 +-
 .../kafka/kafka2hdfs/LineOutputOperator.java       |    2 +-
 examples/machinedata/pom.xml                       |    2 +-
 .../apex/examples/machinedata/Application.java     |    4 +-
 .../machinedata/operator/CalculatorOperator.java   |    5 +-
 .../operator/MachineInfoAveragingOperator.java     |    5 +-
 .../MachineInfoAveragingPrerequisitesOperator.java |    2 +-
 .../operator/MachineInfoAveragingUnifier.java      |    3 +-
 .../machinedata/CalculatorOperatorTest.java        |    8 +-
 examples/mobile/pom.xml                            |    2 +-
 .../apache/apex/examples/mobile/Application.java   |   10 +-
 .../examples/mobile/PhoneMovementGenerator.java    |    4 +-
 .../apex/examples/mobile/ApplicationTest.java      |   10 +-
 examples/mrmonitor/pom.xml                         |    2 +-
 .../apex/examples/mrmonitor/Application.java       |    4 +-
 .../mrmonitor/MRMonitoringApplication.java         |    5 +-
 .../mrmonitor/MrMonitoringApplicationTest.java     |    2 +-
 examples/mroperator/pom.xml                        |    2 +-
 .../mroperator/HdfsKeyValOutputOperator.java       |    4 +-
 .../apex/examples/mroperator/MapOperator.java      |    3 +-
 .../examples/mroperator/OutputCollectorImpl.java   |    2 +-
 .../apex/examples/mroperator/ReduceOperator.java   |    2 +-
 .../apex/examples/mroperator/MapOperatorTest.java  |    3 +-
 .../examples/mroperator/ReduceOperatorTest.java    |    5 +-
 examples/nyctaxi/pom.xml                           |    2 +-
 .../apache/apex/examples/nyctaxi/Application.java  |    6 +-
 .../apex/examples/nyctaxi/NycTaxiDataServer.java   |    2 +-
 .../examples/nyctaxi/NycTaxiZipFareExtractor.java  |    2 +-
 examples/partition/pom.xml                         |    2 +-
 .../org/apache/apex/examples/partition/Codec3.java |    2 +-
 examples/pi/pom.xml                                |    2 +-
 .../org/apache/apex/examples/pi/Application.java   |    6 +-
 .../apex/examples/pi/ApplicationAppData.java       |   14 +-
 .../apex/examples/pi/ApplicationWithScript.java    |   14 +-
 .../org/apache/apex/examples/pi/Calculator.java    |   22 +-
 .../pi/src/main/resources/app/PiJsonExample.json   |    4 +-
 examples/pom.xml                                   |    2 +-
 examples/r/pom.xml                                 |    2 +-
 .../examples/r/oldfaithful/FaithfulRScript.java    |    3 +-
 .../r/oldfaithful/OldFaithfulApplication.java      |    2 +-
 examples/recordReader/pom.xml                      |    2 +-
 .../apex/examples/recordReader/Application.java    |    4 +-
 examples/s3/pom.xml                                |    2 +-
 .../apache/apex/examples/s3Output/Application.java |    2 +-
 .../s3ToHdfsSync/S3ToHDFSSyncApplication.java      |    4 +-
 .../META-INF/properties-s3TupleOutput.xml          |    2 +-
 examples/sql/pom.xml                               |    2 +-
 .../sql/sample/FusionStyleSQLApplication.java      |    2 +-
 examples/throttle/pom.xml                          |    2 +-
 examples/transform/pom.xml                         |    2 +-
 .../transform/DynamicTransformApplication.java     |    4 +-
 .../transform/SimpleTransformApplication.java      |    2 +-
 examples/twitter/pom.xml                           |    2 +-
 .../twitter/KinesisHashtagsApplication.java        |   24 +-
 .../examples/twitter/TwitterDumpApplication.java   |    5 +-
 .../twitter/TwitterDumpHBaseApplication.java       |    5 +-
 .../twitter/TwitterTopCounterApplication.java      |   19 +-
 .../twitter/TwitterTopWordsApplication.java        |    4 +-
 .../TwitterTrendingHashtagsApplication.java        |    8 +-
 .../examples/twitter/TwitterTopCounterTest.java    |    3 +-
 .../apex/examples/twitter/TwitterTopWordsTest.java |    3 +-
 examples/uniquecount/pom.xml                       |    2 +-
 .../apex/examples/uniquecount/Application.java     |   12 +-
 .../apex/examples/uniquecount/CountVerifier.java   |    3 +-
 .../examples/uniquecount/RandomDataGenerator.java  |    3 +-
 .../apex/examples/uniquecount/RandomKeyValues.java |    3 +-
 .../examples/uniquecount/RandomKeysGenerator.java  |    2 +-
 .../uniquecount/UniqueKeyValCountExample.java      |    9 +-
 examples/wordcount/pom.xml                         |    2 +-
 .../apex/examples/wordcount/Application.java       |    8 +-
 .../wordcount/ApplicationWithQuerySupport.java     |   11 +-
 .../apache/apex/examples/wordcount/LineReader.java |    2 +-
 .../examples/wordcount/WordCountInputOperator.java |    2 +-
 .../apex/examples/wordcount/WordCountWriter.java   |    2 +-
 examples/yahoofinance/pom.xml                      |    2 +-
 .../yahoofinance/ApplicationWithDerbySQL.java      |    2 +-
 .../apex/examples/yahoofinance/StockTickInput.java |    2 +-
 .../yahoofinance/YahooFinanceApplication.java      |   40 +-
 .../yahoofinance/YahooFinanceCSVInputOperator.java |    2 +-
 .../src/test/resources/alert_create.json           |    6 +-
 flume/pom.xml                                      |    2 +-
 .../apex/malhar/flume/storage/HDFSStorage.java     |    3 +-
 hive/pom.xml                                       |    2 +-
 .../hive/AbstractFSRollingOutputOperator.java      |  278 --
 .../contrib/hive/FSPojoToHiveOperator.java         |  292 --
 .../com/datatorrent/contrib/hive/HiveOperator.java |  308 ---
 .../com/datatorrent/contrib/hive/HiveStore.java    |   52 -
 .../datatorrent/contrib/hive/HiveStreamCodec.java  |   79 -
 .../com/datatorrent/contrib/hive/package-info.java |   20 -
 .../hive/AbstractFSRollingOutputOperator.java      |  278 ++
 .../apex/malhar/hive/FSPojoToHiveOperator.java     |  292 ++
 .../org/apache/apex/malhar/hive/HiveOperator.java  |  308 +++
 .../apache/apex/malhar/hive/HiveOutputModule.java  |    5 +-
 .../org/apache/apex/malhar/hive/HiveStore.java     |   52 +
 .../apache/apex/malhar/hive/HiveStreamCodec.java   |   79 +
 .../org/apache/apex/malhar/hive/package-info.java  |   20 +
 .../contrib/hive/FSRollingMapTestImpl.java         |   49 -
 .../contrib/hive/FSRollingTestImpl.java            |   39 -
 .../com/datatorrent/contrib/hive/HiveMockTest.java |  629 -----
 .../datatorrent/contrib/hive/HiveStoreTest.java    |   32 -
 .../apex/malhar/hive/FSRollingMapTestImpl.java     |   49 +
 .../apache/apex/malhar/hive/FSRollingTestImpl.java |   39 +
 .../org/apache/apex/malhar/hive/HiveMockTest.java  |  629 +++++
 .../org/apache/apex/malhar/hive/HiveStoreTest.java |   32 +
 kafka/kafka-common/pom.xml                         |    2 +-
 .../malhar/kafka/AbstractKafkaPartitioner.java     |    2 +-
 kafka/kafka010/pom.xml                             |    2 +-
 .../apex/malhar/kafka/KafkaOperatorTestBase.java   |    2 +-
 kafka/kafka09/pom.xml                              |    2 +-
 .../apex/malhar/kafka/KafkaOperatorTestBase.java   |    2 +-
 .../apex/malhar/kafka/KafkaOutputOperatorTest.java |    2 +-
 kafka/pom.xml                                      |    2 +-
 kudu/pom.xml                                       |    2 +-
 .../malhar/kudu/AbstractKuduInputOperator.java     |    2 +-
 .../malhar/kudu/AbstractKuduOutputOperator.java    |    2 +-
 .../apex/malhar/kudu/ApexKuduConnection.java       |    7 +-
 .../partitioner/AbstractKuduInputPartitioner.java  |    2 +-
 .../kudu/scanner/KuduPartitionScannerCallable.java |    3 +-
 .../kudu/IncrementalStepScanInputOperatorTest.java |    4 +-
 .../apex/malhar/kudu/KuduClientTestCommons.java    |    3 +-
 .../KuduCreateUpdateDeleteOutputOperatorTest.java  |    4 +-
 .../apex/malhar/kudu/KuduInputOperatorCommons.java |    4 +-
 .../partitioner/KuduOneToManyPartitionerTest.java  |    2 +-
 .../partitioner/KuduOneToOnePartitionerTest.java   |    2 +-
 library/pom.xml                                    |    2 +-
 .../java/com/datatorrent/lib/algo/BottomNMap.java  |  107 -
 .../com/datatorrent/lib/algo/BottomNUnifier.java   |  134 -
 .../com/datatorrent/lib/algo/BottomNUniqueMap.java |   91 -
 .../lib/algo/CompareExceptCountMap.java            |  130 -
 .../java/com/datatorrent/lib/algo/Distinct.java    |  112 -
 .../com/datatorrent/lib/algo/FilterValues.java     |  171 --
 .../java/com/datatorrent/lib/algo/InsertSort.java  |  133 -
 .../lib/algo/LeastFrequentKeyArrayUnifier.java     |   96 -
 .../lib/algo/LeastFrequentKeyUnifier.java          |   93 -
 .../datatorrent/lib/algo/LeastFrequentValue.java   |  140 -
 .../java/com/datatorrent/lib/algo/MatchAllMap.java |  119 -
 .../java/com/datatorrent/lib/algo/MatchAnyMap.java |  116 -
 .../java/com/datatorrent/lib/algo/MatchMap.java    |  140 -
 .../java/com/datatorrent/lib/algo/MergeSort.java   |  196 --
 .../com/datatorrent/lib/algo/MergeSortNumber.java  |  107 -
 .../datatorrent/lib/algo/MostFrequentValue.java    |  143 -
 .../main/java/com/datatorrent/lib/algo/TopN.java   |  117 -
 .../java/com/datatorrent/lib/algo/TopNUnique.java  |   97 -
 .../com/datatorrent/lib/algo/UniqueCounter.java    |  135 -
 .../com/datatorrent/lib/algo/UniqueValueCount.java |  266 --
 .../com/datatorrent/lib/algo/package-info.java     |   23 -
 .../com/datatorrent/lib/appdata/QueueUtils.java    |   72 -
 .../com/datatorrent/lib/appdata/StoreUtils.java    |   86 -
 .../datastructs/CacheLRUSynchronousFlush.java      |  204 --
 .../lib/appdata/datastructs/DimensionalTable.java  |  348 ---
 .../appdata/datastructs/NOPCacheFlushListener.java |   36 -
 .../lib/appdata/gpo/GPOByteArrayList.java          |   95 -
 .../datatorrent/lib/appdata/gpo/GPOGetters.java    |   79 -
 .../datatorrent/lib/appdata/gpo/GPOMutable.java    |  765 ------
 .../com/datatorrent/lib/appdata/gpo/GPOType.java   |  766 ------
 .../com/datatorrent/lib/appdata/gpo/GPOUtils.java  | 2543 ------------------
 .../com/datatorrent/lib/appdata/gpo/Serde.java     |   37 -
 .../lib/appdata/gpo/SerdeFieldsDescriptor.java     |   80 -
 .../lib/appdata/gpo/SerdeListGPOMutable.java       |   91 -
 .../lib/appdata/gpo/SerdeListPrimitive.java        |   88 -
 .../lib/appdata/gpo/SerdeListString.java           |   83 -
 .../lib/appdata/gpo/SerdeMapPrimitive.java         |  100 -
 .../lib/appdata/gpo/SerdeObjectPayloadFix.java     |   28 -
 .../com/datatorrent/lib/appdata/package-info.java  |   20 -
 .../query/AbstractWindowEndQueueManager.java       |  328 ---
 .../query/AppDataWindowEndQueueManager.java        |   88 -
 .../datatorrent/lib/appdata/query/QueryBundle.java |   60 -
 .../lib/appdata/query/QueryExecutor.java           |   40 -
 .../appdata/query/QueryManagerAsynchronous.java    |  234 --
 .../lib/appdata/query/QueryManagerSynchronous.java |  194 --
 .../datatorrent/lib/appdata/query/QueueList.java   |  220 --
 .../lib/appdata/query/QueueManager.java            |   89 -
 .../lib/appdata/query/SimpleDoneQueueManager.java  |   67 -
 .../lib/appdata/query/SimpleQueueManager.java      |  117 -
 .../lib/appdata/query/WindowBoundedService.java    |  175 --
 .../lib/appdata/query/WindowEndQueueManager.java   |   72 -
 .../query/serde/CustomMessageDeserializer.java     |   41 -
 .../query/serde/CustomMessageSerializer.java       |   38 -
 .../query/serde/CustomMessageValidator.java        |   37 -
 .../query/serde/DataQuerySnapshotDeserializer.java |  170 --
 .../query/serde/DataQuerySnapshotValidator.java    |   67 -
 .../query/serde/DataResultSnapshotSerializer.java  |   83 -
 .../query/serde/MessageDeserializerFactory.java    |  217 --
 .../query/serde/MessageDeserializerInfo.java       |   37 -
 .../query/serde/MessageSerializerFactory.java      |  139 -
 .../appdata/query/serde/MessageSerializerInfo.java |   37 -
 .../lib/appdata/query/serde/MessageType.java       |   37 -
 .../appdata/query/serde/MessageValidatorInfo.java  |   38 -
 .../query/serde/SchemaQueryDeserializer.java       |   99 -
 .../query/serde/SimpleDataDeserializer.java        |   59 -
 .../appdata/query/serde/SimpleDataSerializer.java  |   53 -
 .../appdata/query/serde/SimpleDataValidator.java   |   49 -
 .../lib/appdata/schemas/CustomTimeBucket.java      |  202 --
 .../lib/appdata/schemas/DataQuerySnapshot.java     |  143 -
 .../lib/appdata/schemas/DataResultSnapshot.java    |   96 -
 .../schemas/DimensionalConfigurationSchema.java    | 2788 --------------------
 .../lib/appdata/schemas/DimensionalSchema.java     |  824 ------
 .../datatorrent/lib/appdata/schemas/Fields.java    |  127 -
 .../lib/appdata/schemas/FieldsDescriptor.java      |  443 ----
 .../datatorrent/lib/appdata/schemas/JSONType.java  |   43 -
 .../datatorrent/lib/appdata/schemas/Message.java   |   87 -
 .../datatorrent/lib/appdata/schemas/QRBase.java    |  153 --
 .../com/datatorrent/lib/appdata/schemas/Query.java |  132 -
 .../datatorrent/lib/appdata/schemas/Result.java    |   86 -
 .../lib/appdata/schemas/ResultFormatter.java       |  468 ----
 .../datatorrent/lib/appdata/schemas/Schema.java    |   74 -
 .../lib/appdata/schemas/SchemaQuery.java           |  102 -
 .../lib/appdata/schemas/SchemaRegistry.java        |   64 -
 .../appdata/schemas/SchemaRegistryMultiple.java    |  123 -
 .../lib/appdata/schemas/SchemaRegistrySingle.java  |  107 -
 .../lib/appdata/schemas/SchemaResult.java          |  105 -
 .../appdata/schemas/SchemaResultSerializer.java    |   78 -
 .../lib/appdata/schemas/SchemaUtils.java           |  495 ----
 .../lib/appdata/schemas/SnapshotSchema.java        |  316 ---
 .../lib/appdata/schemas/TimeBucket.java            |  244 --
 .../com/datatorrent/lib/appdata/schemas/Type.java  |  300 ---
 .../snapshot/AbstractAppDataSnapshotServer.java    |  360 ---
 .../appdata/snapshot/AppDataSnapshotServerMap.java |  122 -
 .../snapshot/AppDataSnapshotServerPOJO.java        |  111 -
 .../lib/bandwidth/BandwidthLimitingOperator.java   |   31 -
 .../lib/bandwidth/BandwidthManager.java            |  133 -
 .../lib/bandwidth/BandwidthPartitioner.java        |   81 -
 .../lib/codec/JavaSerializationStreamCodec.java    |   77 -
 .../datatorrent/lib/codec/KryoJdkContainer.java    |   98 -
 .../lib/codec/KryoSerializableStreamCodec.java     |  108 -
 .../com/datatorrent/lib/codec/package-info.java    |   24 -
 .../ByteArrayToStringConverterOperator.java        |   69 -
 .../com/datatorrent/lib/converter/Converter.java   |   43 -
 .../converter/MapToKeyHashValuePairConverter.java  |   60 -
 .../lib/converter/MapToKeyValuePairConverter.java  |   60 -
 .../StringValueToNumberConverterForMap.java        |   76 -
 .../datatorrent/lib/converter/package-info.java    |   20 -
 .../datatorrent/lib/counters/BasicCounters.java    |  203 --
 .../com/datatorrent/lib/counters/package-info.java |   23 -
 ...TransactionableKeyValueStoreOutputOperator.java |   39 -
 ...ggregateTransactionableStoreOutputOperator.java |   54 -
 ...actBatchTransactionableStoreOutputOperator.java |   72 -
 .../lib/db/AbstractKeyValueStoreInputOperator.java |   77 -
 ...TransactionableKeyValueStoreOutputOperator.java |   41 -
 ...PassThruTransactionableStoreOutputOperator.java |   60 -
 .../lib/db/AbstractStoreInputOperator.java         |   96 -
 .../lib/db/AbstractStoreOutputOperator.java        |  110 -
 ...AbstractTransactionableStoreOutputOperator.java |  129 -
 .../java/com/datatorrent/lib/db/Connectable.java   |   49 -
 .../java/com/datatorrent/lib/db/KeyValueStore.java |   69 -
 .../com/datatorrent/lib/db/Transactionable.java    |   47 -
 .../lib/db/TransactionableKeyValueStore.java       |   29 -
 .../datatorrent/lib/db/TransactionableStore.java   |   53 -
 .../cache/AbstractDBLookupCacheBackedOperator.java |  174 --
 .../com/datatorrent/lib/db/cache/CacheManager.java |  331 ---
 .../com/datatorrent/lib/db/cache/CacheStore.java   |  252 --
 .../com/datatorrent/lib/db/cache/package-info.java |   20 -
 .../lib/db/jdbc/AbstractJdbcInputOperator.java     |  105 -
 ...tJdbcNonTransactionableBatchOutputOperator.java |  165 --
 ...stractJdbcNonTransactionableOutputOperator.java |   86 -
 .../db/jdbc/AbstractJdbcPOJOOutputOperator.java    |  321 ---
 .../lib/db/jdbc/AbstractJdbcPollInputOperator.java |  838 ------
 .../AbstractJdbcTransactionableOutputOperator.java |  239 --
 .../lib/db/jdbc/JDBCDimensionalOutputOperator.java |  464 ----
 .../lib/db/jdbc/JDBCLookupCacheBackedOperator.java |  137 -
 .../com/datatorrent/lib/db/jdbc/JdbcFieldInfo.java |   60 -
 .../lib/db/jdbc/JdbcNonTransactionalStore.java     |   92 -
 .../lib/db/jdbc/JdbcPOJOInputOperator.java         |  670 -----
 .../lib/db/jdbc/JdbcPOJOInsertOutputOperator.java  |  201 --
 .../db/jdbc/JdbcPOJONonInsertOutputOperator.java   |   76 -
 .../lib/db/jdbc/JdbcPOJOPollInputOperator.java     |  362 ---
 .../lib/db/jdbc/JdbcPollInputOperator.java         |   86 -
 .../com/datatorrent/lib/db/jdbc/JdbcStore.java     |  207 --
 .../lib/db/jdbc/JdbcTransactionalStore.java        |  269 --
 .../com/datatorrent/lib/db/jdbc/package-info.java  |   22 -
 .../java/com/datatorrent/lib/db/package-info.java  |   23 -
 .../com/datatorrent/lib/expression/Expression.java |   63 -
 .../lib/expression/JavaExpressionParser.java       |  161 --
 .../datatorrent/lib/fileaccess/DTFileReader.java   |  131 -
 .../com/datatorrent/lib/fileaccess/FileAccess.java |  186 --
 .../lib/fileaccess/FileAccessFSImpl.java           |  155 --
 .../com/datatorrent/lib/fileaccess/TFileImpl.java  |  179 --
 .../datatorrent/lib/fileaccess/TFileReader.java    |  145 -
 .../datatorrent/lib/fileaccess/TFileWriter.java    |   75 -
 .../datatorrent/lib/fileaccess/package-info.java   |   20 -
 .../com/datatorrent/lib/filter/FilterOperator.java |  239 --
 .../com/datatorrent/lib/formatter/Formatter.java   |  138 -
 .../datatorrent/lib/formatter/JsonFormatter.java   |   64 -
 .../datatorrent/lib/formatter/XmlFormatter.java    |  157 --
 .../lib/io/AbstractFTPInputOperator.java           |  215 --
 .../io/AbstractHttpGetMultiValuedMapOperator.java  |   52 -
 .../lib/io/AbstractHttpGetOperator.java            |   68 -
 .../lib/io/AbstractHttpInputOperator.java          |  139 -
 .../datatorrent/lib/io/AbstractHttpOperator.java   |   94 -
 .../io/AbstractKeyValueStoreOutputOperator.java    |  174 --
 .../lib/io/AbstractSocketInputOperator.java        |  224 --
 .../datatorrent/lib/io/ApacheGenRandomLogs.java    |  226 --
 .../io/CollectionMultiConsoleOutputOperator.java   |   97 -
 .../datatorrent/lib/io/ConsoleOutputOperator.java  |  135 -
 .../com/datatorrent/lib/io/HttpGetMapOperator.java |   63 -
 .../lib/io/HttpJsonChunksInputOperator.java        |  158 --
 .../datatorrent/lib/io/HttpLinesInputOperator.java |   56 -
 .../com/datatorrent/lib/io/HttpOutputOperator.java |   49 -
 .../datatorrent/lib/io/HttpPostOutputOperator.java |   67 -
 .../lib/io/IdempotentStorageManager.java           |  420 ---
 .../lib/io/MapMultiConsoleOutputOperator.java      |   90 -
 .../lib/io/PubSubWebSocketAppDataQuery.java        |  200 --
 .../lib/io/PubSubWebSocketAppDataResult.java       |  125 -
 .../lib/io/PubSubWebSocketInputOperator.java       |   90 -
 .../lib/io/PubSubWebSocketOutputOperator.java      |   68 -
 .../lib/io/SimpleSinglePortInputOperator.java      |  137 -
 .../com/datatorrent/lib/io/SmtpOutputOperator.java |  309 ---
 .../datatorrent/lib/io/WebSocketInputOperator.java |  250 --
 .../lib/io/WebSocketOutputOperator.java            |  261 --
 .../lib/io/WebSocketServerInputOperator.java       |  163 --
 .../datatorrent/lib/io/WidgetOutputOperator.java   |  374 ---
 .../lib/io/block/AbstractBlockReader.java          |  581 ----
 .../lib/io/block/AbstractFSBlockReader.java        |  138 -
 .../datatorrent/lib/io/block/BlockMetadata.java    |  270 --
 .../com/datatorrent/lib/io/block/BlockWriter.java  |  236 --
 .../datatorrent/lib/io/block/FSSliceReader.java    |   58 -
 .../datatorrent/lib/io/block/ReaderContext.java    |  464 ----
 .../com/datatorrent/lib/io/block/package-info.java |   19 -
 .../lib/io/fs/AbstractFileInputOperator.java       | 1338 ----------
 .../lib/io/fs/AbstractFileOutputOperator.java      | 1383 ----------
 .../lib/io/fs/AbstractFileSplitter.java            |  609 -----
 .../datatorrent/lib/io/fs/AbstractReconciler.java  |  224 --
 .../io/fs/AbstractSingleFileOutputOperator.java    |  128 -
 .../io/fs/AbstractThroughputFileInputOperator.java |  200 --
 .../io/fs/AbstractWindowFileOutputOperator.java    |   78 -
 .../com/datatorrent/lib/io/fs/FSInputModule.java   |  341 ---
 .../java/com/datatorrent/lib/io/fs/FileMerger.java |  139 -
 .../com/datatorrent/lib/io/fs/FileSplitter.java    | 1003 -------
 .../datatorrent/lib/io/fs/FileSplitterBase.java    |  147 --
 .../datatorrent/lib/io/fs/FileSplitterInput.java   |  713 -----
 .../com/datatorrent/lib/io/fs/FileStitcher.java    |  441 ----
 .../datatorrent/lib/io/fs/FilterStreamCodec.java   |  192 --
 .../datatorrent/lib/io/fs/FilterStreamContext.java |   73 -
 .../lib/io/fs/FilterStreamProvider.java            |  150 --
 .../datatorrent/lib/io/fs/HDFSFileCopyModule.java  |  174 --
 .../com/datatorrent/lib/io/fs/HDFSFileMerger.java  |  221 --
 .../com/datatorrent/lib/io/fs/S3BlockReader.java   |  257 --
 .../com/datatorrent/lib/io/fs/S3InputModule.java   |   62 -
 .../com/datatorrent/lib/io/fs/Synchronizer.java    |  375 ---
 .../datatorrent/lib/io/fs/TailFsInputOperator.java |  309 ---
 .../com/datatorrent/lib/io/fs/package-info.java    |   23 -
 .../lib/io/jms/AbstractJMSInputOperator.java       |  530 ----
 .../lib/io/jms/AbstractJMSOutputOperator.java      |  275 --
 .../jms/AbstractJMSSinglePortOutputOperator.java   |   79 -
 .../lib/io/jms/FSPsuedoTransactionableStore.java   |  267 --
 .../java/com/datatorrent/lib/io/jms/JMSBase.java   |  556 ----
 .../lib/io/jms/JMSBaseTransactionableStore.java    |  119 -
 .../lib/io/jms/JMSMultiPortOutputOperator.java     |  160 --
 .../lib/io/jms/JMSObjectInputOperator.java         |  141 -
 .../lib/io/jms/JMSStringInputOperator.java         |   54 -
 .../lib/io/jms/JMSTransactionableStore.java        |  259 --
 .../com/datatorrent/lib/io/jms/package-info.java   |   23 -
 .../java/com/datatorrent/lib/io/package-info.java  |   24 -
 .../datatorrent/lib/join/AbstractJoinOperator.java |  442 ----
 .../com/datatorrent/lib/join/AntiJoinOperator.java |  203 --
 .../main/java/com/datatorrent/lib/join/Bucket.java |   93 -
 .../com/datatorrent/lib/join/InMemoryStore.java    |  109 -
 .../java/com/datatorrent/lib/join/JoinStore.java   |   93 -
 .../com/datatorrent/lib/join/MapJoinOperator.java  |  102 -
 .../com/datatorrent/lib/join/POJOJoinOperator.java |  268 --
 .../com/datatorrent/lib/join/SemiJoinOperator.java |  206 --
 .../com/datatorrent/lib/join/TimeBasedStore.java   |  335 ---
 .../java/com/datatorrent/lib/join/TimeEvent.java   |   53 -
 .../com/datatorrent/lib/join/TimeEventImpl.java    |  123 -
 .../lib/logs/ApacheLogParseMapOutputOperator.java  |  226 --
 .../lib/logs/ApacheLogParseOperator.java           |  172 --
 .../lib/logs/ApacheVirtualLogParseOperator.java    |  200 --
 .../lib/logs/DimensionAggregationUnifier.java      |  109 -
 .../com/datatorrent/lib/logs/DimensionObject.java  |  102 -
 .../lib/logs/FilteredLineToTokenArrayList.java     |   87 -
 .../lib/logs/FilteredLineToTokenHashMap.java       |   90 -
 .../lib/logs/FilteredLineTokenizerKeyVal.java      |   87 -
 .../datatorrent/lib/logs/InformationExtractor.java |   49 -
 .../datatorrent/lib/logs/LineToTokenArrayList.java |  179 --
 .../datatorrent/lib/logs/LineToTokenHashMap.java   |  145 -
 .../com/datatorrent/lib/logs/LineTokenizer.java    |   72 -
 .../datatorrent/lib/logs/LineTokenizerKeyVal.java  |  139 -
 .../lib/logs/MultiWindowDimensionAggregation.java  |  288 --
 .../lib/logs/RegexMatchMapOperator.java            |  161 --
 .../com/datatorrent/lib/logs/package-info.java     |   23 -
 .../lib/math/AbstractAggregateCalc.java            |  100 -
 .../com/datatorrent/lib/math/AbstractOutput.java   |   60 -
 .../lib/math/AbstractXmlCartesianProduct.java      |  498 ----
 .../math/AbstractXmlKeyValueCartesianProduct.java  |   70 -
 .../java/com/datatorrent/lib/math/Average.java     |  141 -
 .../com/datatorrent/lib/math/AverageKeyVal.java    |  145 -
 .../java/com/datatorrent/lib/math/Division.java    |  218 --
 .../com/datatorrent/lib/math/LogicalCompare.java   |  111 -
 .../lib/math/LogicalCompareToConstant.java         |  131 -
 .../main/java/com/datatorrent/lib/math/Margin.java |  141 -
 .../com/datatorrent/lib/math/MarginKeyVal.java     |  184 --
 .../java/com/datatorrent/lib/math/MarginMap.java   |  173 --
 .../main/java/com/datatorrent/lib/math/Max.java    |  100 -
 .../java/com/datatorrent/lib/math/MaxKeyVal.java   |  113 -
 .../main/java/com/datatorrent/lib/math/Min.java    |  106 -
 .../java/com/datatorrent/lib/math/MinKeyVal.java   |  105 -
 .../datatorrent/lib/math/MultiplyByConstant.java   |  120 -
 .../main/java/com/datatorrent/lib/math/Range.java  |  104 -
 .../java/com/datatorrent/lib/math/RangeKeyVal.java |  130 -
 .../com/datatorrent/lib/math/RunningAverage.java   |  116 -
 .../main/java/com/datatorrent/lib/math/Sigma.java  |   73 -
 .../lib/math/SingleVariableAbstractCalculus.java   |   87 -
 .../com/datatorrent/lib/math/SquareCalculus.java   |   57 -
 .../main/java/com/datatorrent/lib/math/Sum.java    |  259 --
 .../java/com/datatorrent/lib/math/SumKeyVal.java   |  204 --
 .../math/XmlKeyValueStringCartesianProduct.java    |   61 -
 .../com/datatorrent/lib/math/package-info.java     |   37 -
 .../com/datatorrent/lib/metric/AvgAggregator.java  |   46 -
 .../lib/metric/max/DoubleMaxAggregator.java        |   48 -
 .../lib/metric/max/FloatMaxAggregator.java         |   48 -
 .../lib/metric/max/IntMaxAggregator.java           |   48 -
 .../lib/metric/max/LongMaxAggregator.java          |   48 -
 .../lib/metric/min/DoubleMinAggregator.java        |   48 -
 .../lib/metric/min/FloatMinAggregator.java         |   48 -
 .../lib/metric/min/IntMinAggregator.java           |   48 -
 .../lib/metric/min/LongMinAggregator.java          |   48 -
 .../com/datatorrent/lib/metric/package-info.java   |   22 -
 .../lib/multiwindow/AbstractSlidingWindow.java     |  154 --
 .../multiwindow/AbstractSlidingWindowKeyVal.java   |  157 --
 .../lib/multiwindow/MultiWindowRangeKeyVal.java    |   93 -
 .../lib/multiwindow/MultiWindowSumKeyVal.java      |   98 -
 .../lib/multiwindow/SimpleMovingAverage.java       |  132 -
 .../lib/multiwindow/SimpleMovingAverageObject.java |   65 -
 .../lib/multiwindow/SortedMovingWindow.java        |  165 --
 .../datatorrent/lib/multiwindow/package-info.java  |   23 -
 .../java/com/datatorrent/lib/parser/Parser.java    |  128 -
 .../java/com/datatorrent/lib/parser/XmlParser.java |  189 --
 .../com/datatorrent/lib/parser/package-info.java   |   20 -
 .../StatelessThroughputBasedPartitioner.java       |  105 -
 .../StatsAwareStatelessPartitioner.java            |  253 --
 .../datatorrent/lib/partitioner/package-info.java  |   20 -
 .../lib/projection/ProjectionOperator.java         |  351 ---
 .../datatorrent/lib/script/JavaScriptOperator.java |  207 --
 .../com/datatorrent/lib/script/ScriptOperator.java |  103 -
 .../com/datatorrent/lib/script/package-info.java   |   23 -
 .../datatorrent/lib/statistics/MedianOperator.java |  100 -
 .../datatorrent/lib/statistics/ModeOperator.java   |   96 -
 .../lib/statistics/StandardDeviation.java          |  111 -
 .../lib/statistics/WeightedMeanOperator.java       |  145 -
 .../datatorrent/lib/statistics/package-info.java   |   20 -
 .../datatorrent/lib/stream/AbstractAggregator.java |  144 -
 .../lib/stream/ArrayListAggregator.java            |   53 -
 .../datatorrent/lib/stream/ArrayListToItem.java    |   67 -
 .../datatorrent/lib/stream/ConsolidatorKeyVal.java |  186 --
 .../java/com/datatorrent/lib/stream/Counter.java   |  100 -
 .../java/com/datatorrent/lib/stream/DevNull.java   |   53 -
 .../com/datatorrent/lib/stream/DevNullCounter.java |  188 --
 .../lib/stream/HashMapToKeyValPair.java            |   99 -
 .../lib/stream/JsonByteArrayOperator.java          |  131 -
 .../lib/stream/KeyValPairToHashMap.java            |   70 -
 .../datatorrent/lib/stream/RoundRobinHashMap.java  |  105 -
 .../datatorrent/lib/stream/StreamDuplicater.java   |   71 -
 .../com/datatorrent/lib/stream/StreamMerger.java   |   78 -
 .../com/datatorrent/lib/stream/package-info.java   |   23 -
 .../lib/streamquery/condition/Condition.java       |   47 -
 .../condition/JoinColumnEqualCondition.java        |   79 -
 .../lib/streamquery/index/ColumnIndex.java         |   71 -
 .../datatorrent/lib/streamquery/index/Index.java   |   39 -
 .../lib/testbench/ArrayListTestSink.java           |   81 -
 .../lib/testbench/CollectorTestSink.java           |   80 -
 .../lib/testbench/CompareFilterTuples.java         |  132 -
 .../lib/testbench/CountAndLastTupleTestSink.java   |   49 -
 .../datatorrent/lib/testbench/CountOccurance.java  |  106 -
 .../datatorrent/lib/testbench/CountTestSink.java   |   53 -
 .../datatorrent/lib/testbench/EventClassifier.java |  207 --
 .../EventClassifierNumberToHashDouble.java         |  184 --
 .../datatorrent/lib/testbench/EventGenerator.java  |  357 ---
 .../lib/testbench/EventIncrementer.java            |  238 --
 .../lib/testbench/FilterClassifier.java            |  181 --
 .../lib/testbench/FilteredEventClassifier.java     |  194 --
 .../datatorrent/lib/testbench/HashTestSink.java    |   81 -
 .../lib/testbench/HttpStatusFilter.java            |  101 -
 .../com/datatorrent/lib/testbench/KeyValSum.java   |   87 -
 .../lib/testbench/RandomEventGenerator.java        |  181 --
 .../lib/testbench/RandomWordGenerator.java         |  144 -
 .../datatorrent/lib/testbench/RedisSumOper.java    |   86 -
 .../lib/testbench/SeedEventClassifier.java         |  188 --
 .../lib/testbench/SeedEventGenerator.java          |  261 --
 .../com/datatorrent/lib/testbench/SumTestSink.java |   57 -
 .../lib/testbench/ThroughputCounter.java           |  193 --
 .../datatorrent/lib/testbench/TopOccurrence.java   |  143 -
 .../datatorrent/lib/testbench/package-info.java    |   23 -
 .../lib/transform/TransformOperator.java           |  240 --
 .../lib/util/AbstractBaseFrequentKey.java          |  121 -
 .../lib/util/AbstractBaseFrequentKeyValueMap.java  |  129 -
 .../lib/util/AbstractBaseMatchOperator.java        |  214 --
 .../util/AbstractBaseNNonUniqueOperatorMap.java    |  100 -
 .../lib/util/AbstractBaseNOperatorMap.java         |  117 -
 .../lib/util/AbstractBaseNUniqueOperatorMap.java   |   86 -
 .../lib/util/AbstractBaseSortOperator.java         |  172 --
 .../util/AbstractDimensionTimeBucketOperator.java  |  406 ---
 .../lib/util/AbstractKeyValueStorageAgent.java     |  235 --
 .../lib/util/ActiveMQMessageListener.java          |  194 --
 .../lib/util/ActiveMQMultiTypeMessageListener.java |   98 -
 .../datatorrent/lib/util/ArrayHashMapFrequent.java |  131 -
 .../lib/util/BaseFilteredKeyValueOperator.java     |   85 -
 .../com/datatorrent/lib/util/BaseKeyOperator.java  |   42 -
 .../datatorrent/lib/util/BaseKeyValueOperator.java |  114 -
 .../datatorrent/lib/util/BaseLineTokenizer.java    |  223 --
 .../datatorrent/lib/util/BaseMatchOperator.java    |  226 --
 .../lib/util/BaseNumberKeyValueOperator.java       |  103 -
 .../lib/util/BaseNumberValueOperator.java          |  122 -
 .../datatorrent/lib/util/BaseUniqueKeyCounter.java |   54 -
 .../lib/util/BaseUniqueKeyValueCounter.java        |   59 -
 .../lib/util/DimensionTimeBucketSumOperator.java   |   82 -
 .../java/com/datatorrent/lib/util/FieldInfo.java   |  148 --
 .../datatorrent/lib/util/FieldValueGenerator.java  |  112 -
 .../com/datatorrent/lib/util/FilterOperator.java   |   62 -
 .../java/com/datatorrent/lib/util/HighLow.java     |   95 -
 .../lib/util/JavaScriptFilterOperator.java         |  127 -
 .../com/datatorrent/lib/util/KeyHashValPair.java   |   60 -
 .../java/com/datatorrent/lib/util/KeyValPair.java  |   56 -
 .../com/datatorrent/lib/util/KryoCloneUtils.java   |  171 --
 .../java/com/datatorrent/lib/util/PojoUtils.java   |  783 ------
 .../datatorrent/lib/util/ReusableStringReader.java |  101 -
 .../datatorrent/lib/util/ReversibleComparator.java |   67 -
 .../lib/util/StorageAgentKeyValueStore.java        |   50 -
 .../java/com/datatorrent/lib/util/TableInfo.java   |   71 -
 .../com/datatorrent/lib/util/TimeBucketKey.java    |  185 --
 .../java/com/datatorrent/lib/util/TopNSort.java    |  172 --
 .../com/datatorrent/lib/util/TopNUniqueSort.java   |  198 --
 .../lib/util/UnifierArrayHashMapFrequent.java      |  138 -
 .../com/datatorrent/lib/util/UnifierArrayList.java |   82 -
 .../datatorrent/lib/util/UnifierBooleanAnd.java    |   95 -
 .../com/datatorrent/lib/util/UnifierBooleanOr.java |   94 -
 .../datatorrent/lib/util/UnifierCountOccurKey.java |  107 -
 .../com/datatorrent/lib/util/UnifierHashMap.java   |   95 -
 .../lib/util/UnifierHashMapFrequent.java           |  129 -
 .../lib/util/UnifierHashMapInteger.java            |  103 -
 .../datatorrent/lib/util/UnifierHashMapRange.java  |  108 -
 .../lib/util/UnifierHashMapSumKeys.java            |   93 -
 .../datatorrent/lib/util/UnifierKeyValRange.java   |  109 -
 .../java/com/datatorrent/lib/util/UnifierMap.java  |   96 -
 .../com/datatorrent/lib/util/UnifierRange.java     |   87 -
 .../com/datatorrent/lib/util/UnifierSumNumber.java |   86 -
 .../lib/util/comparator/SliceComparator.java       |   39 -
 .../com/datatorrent/lib/util/package-info.java     |   23 -
 .../com/datatorrent/lib/util/time/WindowUtils.java |  102 -
 .../lib/xml/AbstractXmlDOMOperator.java            |   88 -
 .../apache/apex/malhar/lib/algo/BottomNMap.java    |  107 +
 .../apex/malhar/lib/algo/BottomNUnifier.java       |  135 +
 .../apex/malhar/lib/algo/BottomNUniqueMap.java     |   91 +
 .../malhar/lib/algo/CompareExceptCountMap.java     |  130 +
 .../org/apache/apex/malhar/lib/algo/Distinct.java  |  112 +
 .../apache/apex/malhar/lib/algo/FilterValues.java  |  171 ++
 .../apache/apex/malhar/lib/algo/InsertSort.java    |  133 +
 .../lib/algo/LeastFrequentKeyArrayUnifier.java     |   96 +
 .../malhar/lib/algo/LeastFrequentKeyUnifier.java   |   93 +
 .../apex/malhar/lib/algo/LeastFrequentValue.java   |  140 +
 .../apache/apex/malhar/lib/algo/MatchAllMap.java   |  119 +
 .../apache/apex/malhar/lib/algo/MatchAnyMap.java   |  116 +
 .../org/apache/apex/malhar/lib/algo/MatchMap.java  |  140 +
 .../org/apache/apex/malhar/lib/algo/MergeSort.java |  196 ++
 .../apex/malhar/lib/algo/MergeSortNumber.java      |  107 +
 .../apex/malhar/lib/algo/MostFrequentValue.java    |  143 +
 .../java/org/apache/apex/malhar/lib/algo/TopN.java |  117 +
 .../apache/apex/malhar/lib/algo/TopNUnique.java    |   97 +
 .../apache/apex/malhar/lib/algo/UniqueCounter.java |  136 +
 .../apex/malhar/lib/algo/UniqueValueCount.java     |  267 ++
 .../apache/apex/malhar/lib/algo/package-info.java  |   23 +
 .../malhar/lib/appdata/AbstractAppDataServer.java  |    1 -
 .../apache/apex/malhar/lib/appdata/QueueUtils.java |   72 +
 .../apache/apex/malhar/lib/appdata/StoreUtils.java |   87 +
 .../datastructs/CacheLRUSynchronousFlush.java      |  204 ++
 .../lib/appdata/datastructs/DimensionalTable.java  |  348 +++
 .../appdata/datastructs/NOPCacheFlushListener.java |   36 +
 .../malhar/lib/appdata/gpo/GPOByteArrayList.java   |   95 +
 .../apex/malhar/lib/appdata/gpo/GPOGetters.java    |   79 +
 .../apex/malhar/lib/appdata/gpo/GPOMutable.java    |  765 ++++++
 .../apex/malhar/lib/appdata/gpo/GPOType.java       |  765 ++++++
 .../apex/malhar/lib/appdata/gpo/GPOUtils.java      | 2542 ++++++++++++++++++
 .../apache/apex/malhar/lib/appdata/gpo/Serde.java  |   37 +
 .../lib/appdata/gpo/SerdeFieldsDescriptor.java     |   79 +
 .../lib/appdata/gpo/SerdeListGPOMutable.java       |   90 +
 .../malhar/lib/appdata/gpo/SerdeListPrimitive.java |   87 +
 .../malhar/lib/appdata/gpo/SerdeListString.java    |   83 +
 .../malhar/lib/appdata/gpo/SerdeMapPrimitive.java  |   99 +
 .../lib/appdata/gpo/SerdeObjectPayloadFix.java     |   28 +
 .../apex/malhar/lib/appdata/package-info.java      |   20 +
 .../query/AbstractWindowEndQueueManager.java       |  329 +++
 .../query/AppDataWindowEndQueueManager.java        |   87 +
 .../apex/malhar/lib/appdata/query/QueryBundle.java |   60 +
 .../malhar/lib/appdata/query/QueryExecutor.java    |   40 +
 .../appdata/query/QueryManagerAsynchronous.java    |  235 ++
 .../lib/appdata/query/QueryManagerSynchronous.java |  194 ++
 .../apex/malhar/lib/appdata/query/QueueList.java   |  220 ++
 .../malhar/lib/appdata/query/QueueManager.java     |   89 +
 .../lib/appdata/query/SimpleDoneQueueManager.java  |   66 +
 .../lib/appdata/query/SimpleQueueManager.java      |  118 +
 .../lib/appdata/query/WindowBoundedService.java    |  175 ++
 .../lib/appdata/query/WindowEndQueueManager.java   |   71 +
 .../query/serde/CustomMessageDeserializer.java     |   41 +
 .../query/serde/CustomMessageSerializer.java       |   38 +
 .../query/serde/CustomMessageValidator.java        |   37 +
 .../query/serde/DataQuerySnapshotDeserializer.java |  170 ++
 .../query/serde/DataQuerySnapshotValidator.java    |   67 +
 .../query/serde/DataResultSnapshotSerializer.java  |   83 +
 .../query/serde/MessageDeserializerFactory.java    |  217 ++
 .../query/serde/MessageDeserializerInfo.java       |   37 +
 .../query/serde/MessageSerializerFactory.java      |  139 +
 .../appdata/query/serde/MessageSerializerInfo.java |   37 +
 .../lib/appdata/query/serde/MessageType.java       |   37 +
 .../appdata/query/serde/MessageValidatorInfo.java  |   38 +
 .../query/serde/SchemaQueryDeserializer.java       |   99 +
 .../query/serde/SimpleDataDeserializer.java        |   59 +
 .../appdata/query/serde/SimpleDataSerializer.java  |   53 +
 .../appdata/query/serde/SimpleDataValidator.java   |   49 +
 .../lib/appdata/schemas/CustomTimeBucket.java      |  202 ++
 .../lib/appdata/schemas/DataQuerySnapshot.java     |  143 +
 .../lib/appdata/schemas/DataResultSnapshot.java    |   96 +
 .../schemas/DimensionalConfigurationSchema.java    | 2788 ++++++++++++++++++++
 .../lib/appdata/schemas/DimensionalSchema.java     |  824 ++++++
 .../apex/malhar/lib/appdata/schemas/Fields.java    |  127 +
 .../lib/appdata/schemas/FieldsDescriptor.java      |  443 ++++
 .../apex/malhar/lib/appdata/schemas/JSONType.java  |   43 +
 .../apex/malhar/lib/appdata/schemas/Message.java   |   87 +
 .../apex/malhar/lib/appdata/schemas/QRBase.java    |  153 ++
 .../apex/malhar/lib/appdata/schemas/Query.java     |  132 +
 .../apex/malhar/lib/appdata/schemas/Result.java    |   86 +
 .../lib/appdata/schemas/ResultFormatter.java       |  468 ++++
 .../apex/malhar/lib/appdata/schemas/Schema.java    |   74 +
 .../malhar/lib/appdata/schemas/SchemaQuery.java    |  102 +
 .../malhar/lib/appdata/schemas/SchemaRegistry.java |   64 +
 .../appdata/schemas/SchemaRegistryMultiple.java    |  123 +
 .../lib/appdata/schemas/SchemaRegistrySingle.java  |  107 +
 .../malhar/lib/appdata/schemas/SchemaResult.java   |  105 +
 .../appdata/schemas/SchemaResultSerializer.java    |   78 +
 .../malhar/lib/appdata/schemas/SchemaUtils.java    |  495 ++++
 .../malhar/lib/appdata/schemas/SnapshotSchema.java |  316 +++
 .../malhar/lib/appdata/schemas/TimeBucket.java     |  244 ++
 .../apex/malhar/lib/appdata/schemas/Type.java      |  300 +++
 .../snapshot/AbstractAppDataSnapshotServer.java    |  360 +++
 .../appdata/snapshot/AppDataSnapshotServerMap.java |  122 +
 .../snapshot/AppDataSnapshotServerPOJO.java        |  111 +
 .../lib/bandwidth/BandwidthLimitingOperator.java   |   31 +
 .../malhar/lib/bandwidth/BandwidthManager.java     |  133 +
 .../malhar/lib/bandwidth/BandwidthPartitioner.java |   81 +
 .../lib/codec/JavaSerializationStreamCodec.java    |   77 +
 .../apex/malhar/lib/codec/KryoJdkContainer.java    |   98 +
 .../lib/codec/KryoSerializableStreamCodec.java     |  108 +
 .../apache/apex/malhar/lib/codec/package-info.java |   24 +
 .../ByteArrayToStringConverterOperator.java        |   69 +
 .../apex/malhar/lib/converter/Converter.java       |   43 +
 .../converter/MapToKeyHashValuePairConverter.java  |   61 +
 .../lib/converter/MapToKeyValuePairConverter.java  |   61 +
 .../StringValueToNumberConverterForMap.java        |   76 +
 .../apex/malhar/lib/converter/package-info.java    |   20 +
 .../apex/malhar/lib/counters/BasicCounters.java    |  203 ++
 .../apex/malhar/lib/counters/package-info.java     |   23 +
 ...TransactionableKeyValueStoreOutputOperator.java |   39 +
 ...ggregateTransactionableStoreOutputOperator.java |   54 +
 ...actBatchTransactionableStoreOutputOperator.java |   72 +
 .../lib/db/AbstractKeyValueStoreInputOperator.java |   77 +
 ...TransactionableKeyValueStoreOutputOperator.java |   41 +
 ...PassThruTransactionableStoreOutputOperator.java |   60 +
 .../malhar/lib/db/AbstractStoreInputOperator.java  |   96 +
 .../malhar/lib/db/AbstractStoreOutputOperator.java |  110 +
 ...AbstractTransactionableStoreOutputOperator.java |  129 +
 .../org/apache/apex/malhar/lib/db/Connectable.java |   49 +
 .../apache/apex/malhar/lib/db/KeyValueStore.java   |   69 +
 .../apache/apex/malhar/lib/db/Transactionable.java |   47 +
 .../lib/db/TransactionableKeyValueStore.java       |   29 +
 .../apex/malhar/lib/db/TransactionableStore.java   |   53 +
 .../cache/AbstractDBLookupCacheBackedOperator.java |  175 ++
 .../apex/malhar/lib/db/cache/CacheManager.java     |  332 +++
 .../apex/malhar/lib/db/cache/CacheStore.java       |  252 ++
 .../apex/malhar/lib/db/cache/package-info.java     |   20 +
 .../lib/db/jdbc/AbstractJdbcInputOperator.java     |  105 +
 ...tJdbcNonTransactionableBatchOutputOperator.java |  165 ++
 ...stractJdbcNonTransactionableOutputOperator.java |   87 +
 .../db/jdbc/AbstractJdbcPOJOOutputOperator.java    |  322 +++
 .../lib/db/jdbc/AbstractJdbcPollInputOperator.java |  838 ++++++
 .../AbstractJdbcTransactionableOutputOperator.java |  240 ++
 .../lib/db/jdbc/JDBCDimensionalOutputOperator.java |  464 ++++
 .../lib/db/jdbc/JDBCLookupCacheBackedOperator.java |  137 +
 .../apex/malhar/lib/db/jdbc/JdbcFieldInfo.java     |   60 +
 .../lib/db/jdbc/JdbcNonTransactionalStore.java     |   92 +
 .../malhar/lib/db/jdbc/JdbcPOJOInputOperator.java  |  671 +++++
 .../lib/db/jdbc/JdbcPOJOInsertOutputOperator.java  |  202 ++
 .../db/jdbc/JdbcPOJONonInsertOutputOperator.java   |   76 +
 .../lib/db/jdbc/JdbcPOJOPollInputOperator.java     |  362 +++
 .../malhar/lib/db/jdbc/JdbcPollInputOperator.java  |   86 +
 .../apache/apex/malhar/lib/db/jdbc/JdbcStore.java  |  208 ++
 .../malhar/lib/db/jdbc/JdbcTransactionalStore.java |  269 ++
 .../apex/malhar/lib/db/jdbc/package-info.java      |   22 +
 .../apache/apex/malhar/lib/db/package-info.java    |   23 +
 .../RedshiftJdbcTransactionableOutputOperator.java |    2 +-
 .../lib/db/redshift/RedshiftOutputModule.java      |    2 +-
 .../apex/malhar/lib/dedup/AbstractDeduper.java     |    2 +-
 .../malhar/lib/dedup/BoundedDedupOperator.java     |    5 +-
 .../apex/malhar/lib/dedup/DeduperStreamCodec.java  |    6 +-
 .../malhar/lib/dedup/TimeBasedDedupOperator.java   |    4 +-
 .../lib/dimensions/CustomTimeBucketRegistry.java   |    4 +-
 .../dimensions/DimensionsConversionContext.java    |    4 +-
 .../lib/dimensions/DimensionsDescriptor.java       |   14 +-
 .../malhar/lib/dimensions/DimensionsEvent.java     |    5 +-
 .../aggregator/AbstractCompositeAggregator.java    |    3 +-
 .../aggregator/AbstractIncrementalAggregator.java  |    9 +-
 .../aggregator/AbstractTopBottomAggregator.java    |    5 +-
 .../dimensions/aggregator/AggregatorAverage.java   |    9 +-
 .../lib/dimensions/aggregator/AggregatorCount.java |    8 +-
 .../dimensions/aggregator/AggregatorCumSum.java    |   16 +-
 .../lib/dimensions/aggregator/AggregatorFirst.java |    6 +-
 .../lib/dimensions/aggregator/AggregatorLast.java  |    6 +-
 .../lib/dimensions/aggregator/AggregatorMax.java   |    8 +-
 .../lib/dimensions/aggregator/AggregatorMin.java   |    8 +-
 .../dimensions/aggregator/AggregatorRegistry.java  |    2 +-
 .../lib/dimensions/aggregator/AggregatorSum.java   |    8 +-
 .../lib/dimensions/aggregator/AggregatorUtils.java |   12 +-
 .../dimensions/aggregator/CompositeAggregator.java |    5 +-
 .../aggregator/IncrementalAggregator.java          |    7 +-
 .../lib/dimensions/aggregator/OTFAggregator.java   |    4 +-
 .../apex/malhar/lib/expression/Expression.java     |   63 +
 .../lib/expression/JavaExpressionParser.java       |  161 ++
 .../apex/malhar/lib/fileaccess/DTFileReader.java   |  131 +
 .../apex/malhar/lib/fileaccess/FileAccess.java     |  186 ++
 .../malhar/lib/fileaccess/FileAccessFSImpl.java    |  155 ++
 .../apex/malhar/lib/fileaccess/TFileImpl.java      |  179 ++
 .../apex/malhar/lib/fileaccess/TFileReader.java    |  145 +
 .../apex/malhar/lib/fileaccess/TFileWriter.java    |   75 +
 .../apex/malhar/lib/fileaccess/package-info.java   |   20 +
 .../apex/malhar/lib/filter/FilterOperator.java     |  239 ++
 .../apex/malhar/lib/formatter/Formatter.java       |  139 +
 .../apex/malhar/lib/formatter/JsonFormatter.java   |   64 +
 .../apex/malhar/lib/formatter/XmlFormatter.java    |  157 ++
 .../apache/apex/malhar/lib/fs/FSRecordReader.java  |    6 +-
 .../apex/malhar/lib/fs/FSRecordReaderModule.java   |    4 +-
 .../malhar/lib/fs/GenericFileOutputOperator.java   |    5 +-
 .../malhar/lib/fs/LineByLineFileInputOperator.java |    3 +-
 .../malhar/lib/fs/s3/S3BlockUploadOperator.java    |    4 +-
 .../lib/fs/s3/S3InitiateFileUploadOperator.java    |    2 +-
 .../apex/malhar/lib/fs/s3/S3OutputModule.java      |    6 +-
 .../apache/apex/malhar/lib/fs/s3/S3Reconciler.java |    2 +-
 .../lib/fs/s3/S3ReconcilerQueuePartitioner.java    |    3 +-
 .../apex/malhar/lib/fs/s3/S3RecordReader.java      |    5 +-
 .../malhar/lib/fs/s3/S3RecordReaderModule.java     |    3 +-
 .../apex/malhar/lib/fs/s3/S3TupleOutputModule.java |    4 +-
 .../apache/apex/malhar/lib/function/Function.java  |    3 +-
 .../malhar/lib/io/AbstractFTPInputOperator.java    |  215 ++
 .../io/AbstractHttpGetMultiValuedMapOperator.java  |   52 +
 .../malhar/lib/io/AbstractHttpGetOperator.java     |   68 +
 .../malhar/lib/io/AbstractHttpInputOperator.java   |  139 +
 .../apex/malhar/lib/io/AbstractHttpOperator.java   |   94 +
 .../io/AbstractKeyValueStoreOutputOperator.java    |  175 ++
 .../malhar/lib/io/AbstractSocketInputOperator.java |  224 ++
 .../apex/malhar/lib/io/ApacheGenRandomLogs.java    |  226 ++
 .../io/CollectionMultiConsoleOutputOperator.java   |   97 +
 .../apex/malhar/lib/io/ConsoleOutputOperator.java  |  135 +
 .../apex/malhar/lib/io/HttpGetMapOperator.java     |   63 +
 .../malhar/lib/io/HttpJsonChunksInputOperator.java |  158 ++
 .../apex/malhar/lib/io/HttpLinesInputOperator.java |   56 +
 .../apex/malhar/lib/io/HttpOutputOperator.java     |   49 +
 .../apex/malhar/lib/io/HttpPostOutputOperator.java |   67 +
 .../malhar/lib/io/IdempotentStorageManager.java    |  420 +++
 .../lib/io/MapMultiConsoleOutputOperator.java      |   90 +
 .../malhar/lib/io/PubSubWebSocketAppDataQuery.java |  201 ++
 .../lib/io/PubSubWebSocketAppDataResult.java       |  125 +
 .../lib/io/PubSubWebSocketInputOperator.java       |   90 +
 .../lib/io/PubSubWebSocketOutputOperator.java      |   68 +
 .../lib/io/SimpleSinglePortInputOperator.java      |  137 +
 .../apex/malhar/lib/io/SmtpOutputOperator.java     |  309 +++
 .../apex/malhar/lib/io/WebSocketInputOperator.java |  250 ++
 .../malhar/lib/io/WebSocketOutputOperator.java     |  261 ++
 .../lib/io/WebSocketServerInputOperator.java       |  163 ++
 .../apex/malhar/lib/io/WidgetOutputOperator.java   |  374 +++
 .../malhar/lib/io/block/AbstractBlockReader.java   |  581 ++++
 .../malhar/lib/io/block/AbstractFSBlockReader.java |  138 +
 .../apex/malhar/lib/io/block/BlockMetadata.java    |  270 ++
 .../apex/malhar/lib/io/block/BlockWriter.java      |  236 ++
 .../apex/malhar/lib/io/block/FSSliceReader.java    |   58 +
 .../apex/malhar/lib/io/block/PartFileWriter.java   |    4 +-
 .../apex/malhar/lib/io/block/ReaderContext.java    |  464 ++++
 .../apex/malhar/lib/io/block/package-info.java     |   19 +
 .../lib/io/fs/AbstractFileInputOperator.java       | 1337 ++++++++++
 .../lib/io/fs/AbstractFileOutputOperator.java      | 1383 ++++++++++
 .../malhar/lib/io/fs/AbstractFileSplitter.java     |  610 +++++
 .../apex/malhar/lib/io/fs/AbstractReconciler.java  |  224 ++
 .../io/fs/AbstractSingleFileOutputOperator.java    |  128 +
 .../io/fs/AbstractThroughputFileInputOperator.java |  200 ++
 .../io/fs/AbstractWindowFileOutputOperator.java    |   78 +
 .../apex/malhar/lib/io/fs/FSInputModule.java       |  342 +++
 .../apache/apex/malhar/lib/io/fs/FileMerger.java   |  139 +
 .../apache/apex/malhar/lib/io/fs/FileSplitter.java | 1003 +++++++
 .../apex/malhar/lib/io/fs/FileSplitterBase.java    |  147 ++
 .../apex/malhar/lib/io/fs/FileSplitterInput.java   |  713 +++++
 .../apache/apex/malhar/lib/io/fs/FileStitcher.java |  441 ++++
 .../apex/malhar/lib/io/fs/FilterStreamCodec.java   |  192 ++
 .../apex/malhar/lib/io/fs/FilterStreamContext.java |   73 +
 .../malhar/lib/io/fs/FilterStreamProvider.java     |  150 ++
 .../apex/malhar/lib/io/fs/HDFSFileCopyModule.java  |  174 ++
 .../apex/malhar/lib/io/fs/HDFSFileMerger.java      |  221 ++
 .../apex/malhar/lib/io/fs/S3BlockReader.java       |  257 ++
 .../apex/malhar/lib/io/fs/S3InputModule.java       |   62 +
 .../apache/apex/malhar/lib/io/fs/Synchronizer.java |  375 +++
 .../apex/malhar/lib/io/fs/TailFsInputOperator.java |  309 +++
 .../apache/apex/malhar/lib/io/fs/package-info.java |   23 +
 .../lib/io/jms/AbstractJMSInputOperator.java       |  530 ++++
 .../lib/io/jms/AbstractJMSOutputOperator.java      |  275 ++
 .../jms/AbstractJMSSinglePortOutputOperator.java   |   79 +
 .../lib/io/jms/FSPsuedoTransactionableStore.java   |  267 ++
 .../org/apache/apex/malhar/lib/io/jms/JMSBase.java |  556 ++++
 .../lib/io/jms/JMSBaseTransactionableStore.java    |  119 +
 .../lib/io/jms/JMSMultiPortOutputOperator.java     |  160 ++
 .../malhar/lib/io/jms/JMSObjectInputOperator.java  |  141 +
 .../malhar/lib/io/jms/JMSStringInputOperator.java  |   54 +
 .../malhar/lib/io/jms/JMSTransactionableStore.java |  259 ++
 .../apex/malhar/lib/io/jms/package-info.java       |   23 +
 .../apache/apex/malhar/lib/io/package-info.java    |   24 +
 .../apex/malhar/lib/join/AbstractJoinOperator.java |  442 ++++
 .../AbstractManagedStateInnerJoinOperator.java     |    3 +-
 .../apex/malhar/lib/join/AntiJoinOperator.java     |  203 ++
 .../org/apache/apex/malhar/lib/join/Bucket.java    |   93 +
 .../apache/apex/malhar/lib/join/InMemoryStore.java |  109 +
 .../org/apache/apex/malhar/lib/join/JoinStore.java |   93 +
 .../apex/malhar/lib/join/JoinStreamCodec.java      |    4 +-
 .../apex/malhar/lib/join/MapJoinOperator.java      |  102 +
 .../malhar/lib/join/POJOInnerJoinOperator.java     |    2 +-
 .../apex/malhar/lib/join/POJOJoinOperator.java     |  267 ++
 .../apex/malhar/lib/join/SemiJoinOperator.java     |  206 ++
 .../apex/malhar/lib/join/TimeBasedStore.java       |  335 +++
 .../org/apache/apex/malhar/lib/join/TimeEvent.java |   53 +
 .../apache/apex/malhar/lib/join/TimeEventImpl.java |  123 +
 .../lib/logs/ApacheLogParseMapOutputOperator.java  |  226 ++
 .../malhar/lib/logs/ApacheLogParseOperator.java    |  172 ++
 .../lib/logs/ApacheVirtualLogParseOperator.java    |  200 ++
 .../lib/logs/DimensionAggregationUnifier.java      |  109 +
 .../apex/malhar/lib/logs/DimensionObject.java      |  102 +
 .../lib/logs/FilteredLineToTokenArrayList.java     |   87 +
 .../lib/logs/FilteredLineToTokenHashMap.java       |   90 +
 .../lib/logs/FilteredLineTokenizerKeyVal.java      |   87 +
 .../apex/malhar/lib/logs/InformationExtractor.java |   49 +
 .../apex/malhar/lib/logs/LineToTokenArrayList.java |  179 ++
 .../apex/malhar/lib/logs/LineToTokenHashMap.java   |  145 +
 .../apache/apex/malhar/lib/logs/LineTokenizer.java |   73 +
 .../apex/malhar/lib/logs/LineTokenizerKeyVal.java  |  140 +
 .../lib/logs/MultiWindowDimensionAggregation.java  |  288 ++
 .../malhar/lib/logs/RegexMatchMapOperator.java     |  161 ++
 .../apache/apex/malhar/lib/logs/package-info.java  |   23 +
 .../malhar/lib/math/AbstractAggregateCalc.java     |  100 +
 .../apex/malhar/lib/math/AbstractOutput.java       |   60 +
 .../lib/math/AbstractXmlCartesianProduct.java      |  499 ++++
 .../math/AbstractXmlKeyValueCartesianProduct.java  |   70 +
 .../org/apache/apex/malhar/lib/math/Average.java   |  142 +
 .../apache/apex/malhar/lib/math/AverageKeyVal.java |  145 +
 .../org/apache/apex/malhar/lib/math/Division.java  |  218 ++
 .../apex/malhar/lib/math/LogicalCompare.java       |  111 +
 .../malhar/lib/math/LogicalCompareToConstant.java  |  131 +
 .../org/apache/apex/malhar/lib/math/Margin.java    |  142 +
 .../apache/apex/malhar/lib/math/MarginKeyVal.java  |  184 ++
 .../org/apache/apex/malhar/lib/math/MarginMap.java |  173 ++
 .../java/org/apache/apex/malhar/lib/math/Max.java  |  101 +
 .../org/apache/apex/malhar/lib/math/MaxKeyVal.java |  114 +
 .../java/org/apache/apex/malhar/lib/math/Min.java  |  107 +
 .../org/apache/apex/malhar/lib/math/MinKeyVal.java |  106 +
 .../apex/malhar/lib/math/MultiplyByConstant.java   |  120 +
 .../org/apache/apex/malhar/lib/math/Range.java     |  105 +
 .../apache/apex/malhar/lib/math/RangeKeyVal.java   |  131 +
 .../apex/malhar/lib/math/RunningAverage.java       |  116 +
 .../org/apache/apex/malhar/lib/math/Sigma.java     |   73 +
 .../lib/math/SingleVariableAbstractCalculus.java   |   87 +
 .../apex/malhar/lib/math/SquareCalculus.java       |   57 +
 .../java/org/apache/apex/malhar/lib/math/Sum.java  |  260 ++
 .../org/apache/apex/malhar/lib/math/SumKeyVal.java |  204 ++
 .../math/XmlKeyValueStringCartesianProduct.java    |   61 +
 .../apache/apex/malhar/lib/math/package-info.java  |   37 +
 .../apex/malhar/lib/metric/AvgAggregator.java      |   46 +
 .../malhar/lib/metric/max/DoubleMaxAggregator.java |   48 +
 .../malhar/lib/metric/max/FloatMaxAggregator.java  |   48 +
 .../malhar/lib/metric/max/IntMaxAggregator.java    |   48 +
 .../malhar/lib/metric/max/LongMaxAggregator.java   |   48 +
 .../malhar/lib/metric/min/DoubleMinAggregator.java |   48 +
 .../malhar/lib/metric/min/FloatMinAggregator.java  |   48 +
 .../malhar/lib/metric/min/IntMinAggregator.java    |   48 +
 .../malhar/lib/metric/min/LongMinAggregator.java   |   48 +
 .../apex/malhar/lib/metric/package-info.java       |   22 +
 .../lib/multiwindow/AbstractSlidingWindow.java     |  154 ++
 .../multiwindow/AbstractSlidingWindowKeyVal.java   |  158 ++
 .../lib/multiwindow/MultiWindowRangeKeyVal.java    |   93 +
 .../lib/multiwindow/MultiWindowSumKeyVal.java      |   99 +
 .../lib/multiwindow/SimpleMovingAverage.java       |  133 +
 .../lib/multiwindow/SimpleMovingAverageObject.java |   65 +
 .../malhar/lib/multiwindow/SortedMovingWindow.java |  165 ++
 .../apex/malhar/lib/multiwindow/package-info.java  |   23 +
 .../org/apache/apex/malhar/lib/parser/Parser.java  |  128 +
 .../apache/apex/malhar/lib/parser/XmlParser.java   |  190 ++
 .../apex/malhar/lib/parser/package-info.java       |   20 +
 .../StatelessThroughputBasedPartitioner.java       |  105 +
 .../StatsAwareStatelessPartitioner.java            |  253 ++
 .../apex/malhar/lib/partitioner/package-info.java  |   20 +
 .../malhar/lib/projection/ProjectionOperator.java  |  352 +++
 .../apex/malhar/lib/script/JavaScriptOperator.java |  207 ++
 .../apex/malhar/lib/script/ScriptOperator.java     |  103 +
 .../apex/malhar/lib/script/package-info.java       |   23 +
 .../state/managed/AbstractManagedStateImpl.java    |    7 +-
 .../apex/malhar/lib/state/managed/Bucket.java      |    2 +-
 .../lib/state/managed/BucketsFileSystem.java       |    2 +-
 .../lib/state/managed/ManagedStateContext.java     |    3 +-
 .../state/managed/ManagedTimeStateMultiValue.java  |    2 +-
 .../state/managed/ManagedTimeUnifiedStateImpl.java |    2 +-
 .../apex/malhar/lib/statistics/MedianOperator.java |  100 +
 .../apex/malhar/lib/statistics/ModeOperator.java   |   96 +
 .../malhar/lib/statistics/StandardDeviation.java   |  111 +
 .../lib/statistics/WeightedMeanOperator.java       |  145 +
 .../apex/malhar/lib/statistics/package-info.java   |   20 +
 .../apex/malhar/lib/stream/AbstractAggregator.java |  144 +
 .../malhar/lib/stream/ArrayListAggregator.java     |   53 +
 .../apex/malhar/lib/stream/ArrayListToItem.java    |   68 +
 .../apex/malhar/lib/stream/ConsolidatorKeyVal.java |  187 ++
 .../org/apache/apex/malhar/lib/stream/Counter.java |  100 +
 .../org/apache/apex/malhar/lib/stream/DevNull.java |   53 +
 .../apex/malhar/lib/stream/DevNullCounter.java     |  188 ++
 .../malhar/lib/stream/HashMapToKeyValPair.java     |  100 +
 .../malhar/lib/stream/JsonByteArrayOperator.java   |  131 +
 .../malhar/lib/stream/KeyValPairToHashMap.java     |   71 +
 .../apex/malhar/lib/stream/RoundRobinHashMap.java  |  106 +
 .../apex/malhar/lib/stream/StreamDuplicater.java   |   72 +
 .../apex/malhar/lib/stream/StreamMerger.java       |   78 +
 .../apex/malhar/lib/stream/package-info.java       |   23 +
 .../lib/streamquery/condition/Condition.java       |   47 +
 .../condition/JoinColumnEqualCondition.java        |   79 +
 .../malhar/lib/streamquery/index/ColumnIndex.java  |   71 +
 .../apex/malhar/lib/streamquery/index/Index.java   |   39 +
 .../malhar/lib/testbench/ArrayListTestSink.java    |   81 +
 .../malhar/lib/testbench/CollectorTestSink.java    |   80 +
 .../malhar/lib/testbench/CompareFilterTuples.java  |  132 +
 .../lib/testbench/CountAndLastTupleTestSink.java   |   49 +
 .../apex/malhar/lib/testbench/CountOccurance.java  |  106 +
 .../apex/malhar/lib/testbench/CountTestSink.java   |   53 +
 .../apex/malhar/lib/testbench/EventClassifier.java |  207 ++
 .../EventClassifierNumberToHashDouble.java         |  184 ++
 .../apex/malhar/lib/testbench/EventGenerator.java  |  357 +++
 .../malhar/lib/testbench/EventIncrementer.java     |  239 ++
 .../malhar/lib/testbench/FilterClassifier.java     |  181 ++
 .../lib/testbench/FilteredEventClassifier.java     |  194 ++
 .../apex/malhar/lib/testbench/HashTestSink.java    |   81 +
 .../malhar/lib/testbench/HttpStatusFilter.java     |  101 +
 .../apex/malhar/lib/testbench/KeyValSum.java       |   87 +
 .../malhar/lib/testbench/RandomEventGenerator.java |  181 ++
 .../malhar/lib/testbench/RandomWordGenerator.java  |  144 +
 .../apex/malhar/lib/testbench/RedisSumOper.java    |   86 +
 .../malhar/lib/testbench/SeedEventClassifier.java  |  188 ++
 .../malhar/lib/testbench/SeedEventGenerator.java   |  262 ++
 .../apex/malhar/lib/testbench/SumTestSink.java     |   57 +
 .../malhar/lib/testbench/ThroughputCounter.java    |  193 ++
 .../apex/malhar/lib/testbench/TopOccurrence.java   |  143 +
 .../apex/malhar/lib/testbench/package-info.java    |   23 +
 .../malhar/lib/transform/TransformOperator.java    |  240 ++
 .../malhar/lib/util/AbstractBaseFrequentKey.java   |  121 +
 .../lib/util/AbstractBaseFrequentKeyValueMap.java  |  129 +
 .../malhar/lib/util/AbstractBaseMatchOperator.java |  214 ++
 .../util/AbstractBaseNNonUniqueOperatorMap.java    |  100 +
 .../malhar/lib/util/AbstractBaseNOperatorMap.java  |  117 +
 .../lib/util/AbstractBaseNUniqueOperatorMap.java   |   86 +
 .../malhar/lib/util/AbstractBaseSortOperator.java  |  172 ++
 .../util/AbstractDimensionTimeBucketOperator.java  |  406 +++
 .../lib/util/AbstractKeyValueStorageAgent.java     |  235 ++
 .../malhar/lib/util/ActiveMQMessageListener.java   |  194 ++
 .../lib/util/ActiveMQMultiTypeMessageListener.java |   98 +
 .../apex/malhar/lib/util/ArrayHashMapFrequent.java |  131 +
 .../lib/util/BaseFilteredKeyValueOperator.java     |   85 +
 .../apex/malhar/lib/util/BaseKeyOperator.java      |   42 +
 .../apex/malhar/lib/util/BaseKeyValueOperator.java |  115 +
 .../apex/malhar/lib/util/BaseLineTokenizer.java    |  223 ++
 .../apex/malhar/lib/util/BaseMatchOperator.java    |  226 ++
 .../lib/util/BaseNumberKeyValueOperator.java       |  103 +
 .../malhar/lib/util/BaseNumberValueOperator.java   |  122 +
 .../apex/malhar/lib/util/BaseUniqueKeyCounter.java |   54 +
 .../malhar/lib/util/BaseUniqueKeyValueCounter.java |   59 +
 .../lib/util/DimensionTimeBucketSumOperator.java   |   82 +
 .../org/apache/apex/malhar/lib/util/FieldInfo.java |  148 ++
 .../apex/malhar/lib/util/FieldValueGenerator.java  |  112 +
 .../apex/malhar/lib/util/FilterOperator.java       |   62 +
 .../org/apache/apex/malhar/lib/util/HighLow.java   |   95 +
 .../malhar/lib/util/JavaScriptFilterOperator.java  |  127 +
 .../apex/malhar/lib/util/KeyHashValPair.java       |   60 +
 .../apache/apex/malhar/lib/util/KeyValPair.java    |   56 +
 .../apex/malhar/lib/util/KryoCloneUtils.java       |  171 ++
 .../org/apache/apex/malhar/lib/util/PojoUtils.java |  782 ++++++
 .../apex/malhar/lib/util/ReusableStringReader.java |  101 +
 .../apex/malhar/lib/util/ReversibleComparator.java |   67 +
 .../malhar/lib/util/StorageAgentKeyValueStore.java |   50 +
 .../org/apache/apex/malhar/lib/util/TableInfo.java |   71 +
 .../apache/apex/malhar/lib/util/TimeBucketKey.java |  185 ++
 .../org/apache/apex/malhar/lib/util/TopNSort.java  |  172 ++
 .../apex/malhar/lib/util/TopNUniqueSort.java       |  198 ++
 .../lib/util/UnifierArrayHashMapFrequent.java      |  138 +
 .../apex/malhar/lib/util/UnifierArrayList.java     |   82 +
 .../apex/malhar/lib/util/UnifierBooleanAnd.java    |   95 +
 .../apex/malhar/lib/util/UnifierBooleanOr.java     |   94 +
 .../apex/malhar/lib/util/UnifierCountOccurKey.java |  107 +
 .../apex/malhar/lib/util/UnifierHashMap.java       |   95 +
 .../malhar/lib/util/UnifierHashMapFrequent.java    |  129 +
 .../malhar/lib/util/UnifierHashMapInteger.java     |  103 +
 .../apex/malhar/lib/util/UnifierHashMapRange.java  |  108 +
 .../malhar/lib/util/UnifierHashMapSumKeys.java     |   93 +
 .../apex/malhar/lib/util/UnifierKeyValRange.java   |  109 +
 .../apache/apex/malhar/lib/util/UnifierMap.java    |   96 +
 .../apache/apex/malhar/lib/util/UnifierRange.java  |   87 +
 .../apex/malhar/lib/util/UnifierSumNumber.java     |   86 +
 .../lib/util/comparator/SliceComparator.java       |   39 +
 .../apache/apex/malhar/lib/util/package-info.java  |   23 +
 .../apex/malhar/lib/util/time/WindowUtils.java     |  102 +
 .../apex/malhar/lib/wal/FSWindowDataManager.java   |    4 +-
 .../apex/malhar/lib/wal/WindowDataManager.java     |    3 +-
 .../lib/window/accumulation/AbstractPojoJoin.java  |    5 +-
 .../lib/window/accumulation/PojoFullOuterJoin.java |    5 +-
 .../lib/window/accumulation/PojoInnerJoin.java     |    6 +-
 .../lib/window/accumulation/PojoLeftOuterJoin.java |    5 +-
 .../window/accumulation/PojoRightOuterJoin.java    |    5 +-
 .../malhar/lib/window/accumulation/TopNByKey.java  |    2 +-
 .../impl/KeyedWindowedMergeOperatorImpl.java       |    2 +-
 .../lib/window/impl/KeyedWindowedOperatorImpl.java |    2 +-
 .../window/impl/WindowedMergeOperatorFeatures.java |    3 +-
 .../malhar/lib/xml/AbstractXmlDOMOperator.java     |   88 +
 .../org/apache/hadoop/io/file/tfile/DTFile.java    |    7 +-
 .../com/datatorrent/lib/algo/BottomNMapTest.java   |  119 -
 .../datatorrent/lib/algo/BottomNUnifierTest.java   |   64 -
 .../datatorrent/lib/algo/BottomNUniqueMapTest.java |  121 -
 .../lib/algo/CompareExceptCountMapTest.java        |   82 -
 .../com/datatorrent/lib/algo/DistinctTest.java     |   72 -
 .../com/datatorrent/lib/algo/FilterValuesTest.java |  109 -
 .../com/datatorrent/lib/algo/InsertSortTest.java   |   83 -
 .../datatorrent/lib/algo/LeastFrequentKeyTest.java |  110 -
 .../com/datatorrent/lib/algo/MatchAllMapTest.java  |   88 -
 .../com/datatorrent/lib/algo/MatchAnyMapTest.java  |   88 -
 .../datatorrent/lib/algo/MergeSortNumberTest.java  |   79 -
 .../datatorrent/lib/algo/MostFrequentKeyTest.java  |  111 -
 .../java/com/datatorrent/lib/algo/TopNTest.java    |  125 -
 .../com/datatorrent/lib/algo/TopNUniqueTest.java   |  121 -
 .../datatorrent/lib/algo/UniqueCounterTest.java    |   94 -
 .../datatorrent/lib/algo/UniqueValueCountTest.java |   91 -
 .../com/datatorrent/lib/appdata/ThreadUtils.java   |   59 -
 .../datastructs/CacheLRUSynchronousFlushTest.java  |  147 --
 .../appdata/datastructs/DimensionalTableTest.java  |  162 --
 .../dimensions/CustomTimeBucketRegistryTest.java   |   87 -
 .../appdata/dimensions/DimensionsEventTest.java    |   66 -
 .../lib/appdata/gpo/GPOMutableTest.java            |   51 -
 .../datatorrent/lib/appdata/gpo/GPOUtilsTest.java  |  368 ---
 .../lib/appdata/gpo/SerdeFieldsDescriptorTest.java |   51 -
 .../lib/appdata/gpo/SerdeListGPOMutableTest.java   |  117 -
 .../lib/appdata/gpo/SerdeListPrimitiveTest.java    |   58 -
 .../lib/appdata/gpo/SerdeListStringTest.java       |   56 -
 .../datatorrent/lib/appdata/query/MockQuery.java   |   48 -
 .../datatorrent/lib/appdata/query/MockResult.java  |   41 -
 .../lib/appdata/query/MockResultSerializer.java    |   56 -
 .../query/QueryManagerAsynchronousTest.java        |  176 --
 .../appdata/query/QueryManagerSynchronousTest.java |   79 -
 .../lib/appdata/query/QueueUtilsTest.java          |   92 -
 .../query/SimpleDoneQueryQueueManagerTest.java     |  473 ----
 .../appdata/query/SimpleQueryQueueManagerTest.java |   49 -
 .../lib/appdata/query/WEQueryQueueManagerTest.java |  270 --
 .../appdata/query/WindowBoundedServiceTest.java    |   97 -
 .../serde/MessageDeserializerFactoryTest.java      |   72 -
 .../query/serde/SimpleDataValidatorTest.java       |   49 -
 .../lib/appdata/schemas/CustomTimeBucketTest.java  |   82 -
 .../schemas/DataQuerySnapshotDeserializerTest.java |  175 --
 .../lib/appdata/schemas/DataQuerySnapshotTest.java |   47 -
 .../schemas/DataResultSnapshotSerializerTest.java  |  117 -
 .../DimensionalConfigurationSchemaTest.java        |  514 ----
 .../lib/appdata/schemas/DimensionalSchemaTest.java |  459 ----
 .../lib/appdata/schemas/FieldsDescriptorTest.java  |  124 -
 .../lib/appdata/schemas/ResultFormatterTest.java   |   89 -
 .../lib/appdata/schemas/SchemaQueryTest.java       |  109 -
 .../schemas/SchemaRegistryMultipleTest.java        |  146 -
 .../appdata/schemas/SchemaRegistrySingleTest.java  |   44 -
 .../lib/appdata/schemas/SchemaTestUtils.java       |   48 -
 .../lib/appdata/schemas/SchemaUtilsTest.java       |  149 --
 .../lib/appdata/schemas/SnapshotSchemaTest.java    |   53 -
 .../lib/appdata/schemas/TimeBucketTest.java        |   35 -
 .../snapshot/AppDataSnapshotServerMapTest.java     |  113 -
 .../snapshot/AppDataSnapshotServerPojoTest.java    |   95 -
 .../AppDataSnapshotServerTagsSupportTest.java      |  111 -
 .../lib/bandwidth/BandwidthManagerTest.java        |  269 --
 .../lib/bandwidth/BandwidthPartitionerTest.java    |  106 -
 .../codec/JavaSerializationStreamCodecTest.java    |  132 -
 .../datatorrent/lib/codec/KryoStreamCodecTest.java |  119 -
 .../converter/ByteArrayToStringConverterTest.java  |   76 -
 .../converter/MapToKeyValuePairConverterTest.java  |   56 -
 .../StringValueToNumberConverterForMapTest.java    |   64 -
 .../lib/counters/BasicCountersTest.java            |   83 -
 .../lib/db/KeyValueStoreOperatorTest.java          |  152 --
 .../TransactionableKeyValueStoreOperatorTest.java  |   91 -
 .../datatorrent/lib/db/cache/CacheManagerTest.java |  190 --
 .../datatorrent/lib/db/cache/CacheStoreTest.java   |   58 -
 .../db/jdbc/JDBCLookupCacheBackedOperatorTest.java |  207 --
 .../com/datatorrent/lib/db/jdbc/JdbcIOApp.java     |   86 -
 .../com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java |  175 --
 .../db/jdbc/JdbcInputOperatorApplicationTest.java  |  167 --
 ...dbcNonTransactionalBatchOutputOperatorTest.java |  438 ---
 .../JdbcNonTransactionalOutputOperatorTest.java    |  161 --
 .../lib/db/jdbc/JdbcNonTransactionalStoreTest.java |   76 -
 .../datatorrent/lib/db/jdbc/JdbcOperatorTest.java  |  234 --
 .../db/jdbc/JdbcPojoOperatorApplicationTest.java   |  128 -
 .../lib/db/jdbc/JdbcPojoOperatorTest.java          |  691 -----
 .../lib/db/jdbc/JdbcPojoPollableOpeartorTest.java  |  414 ---
 .../com/datatorrent/lib/db/jdbc/JdbcStoreTest.java |   62 -
 .../com/datatorrent/lib/filter/FilterAppTest.java  |  138 -
 .../com/datatorrent/lib/filter/FilterTest.java     |  207 --
 .../lib/formatter/JsonFormatterTest.java           |  210 --
 .../lib/formatter/XmlFormatterTest.java            |  299 ---
 .../lib/helper/OperatorContextTestHelper.java      |  115 -
 .../lib/helper/SamplePubSubWebSocketServlet.java   |  119 -
 .../datatorrent/lib/helper/TestPortContext.java    |   62 -
 .../datatorrent/lib/io/ApacheRandomLogsTest.java   |   66 -
 .../lib/io/FTPStringInputOperatorTest.java         |  105 -
 .../datatorrent/lib/io/HttpGetMapOperatorTest.java |  115 -
 .../lib/io/HttpJsonChunksInputOperatorTest.java    |  118 -
 .../lib/io/HttpLinesInputOperatorTest.java         |  111 -
 .../lib/io/HttpMultiValuedMapGetOperatorTest.java  |  237 --
 .../lib/io/HttpPostOutputOperatorTest.java         |  111 -
 .../lib/io/IdempotentStorageManagerTest.java       |  201 --
 .../lib/io/PubSubWebSocketAppDataOperatorTest.java |   75 -
 .../lib/io/PubSubWebSocketAppDataQueryTest.java    |   85 -
 .../lib/io/PubSubWebSocketAppDataResultTest.java   |   30 -
 .../lib/io/PubSubWebSocketOperatorTest.java        |  120 -
 .../datatorrent/lib/io/SmtpOutputOperatorTest.java |  159 --
 .../lib/io/SocketInputOperatorTest.java            |  175 --
 .../lib/io/WebSocketServerInputOperatorTest.java   |  102 -
 .../lib/io/block/AbstractBlockReaderTest.java      |  202 --
 .../datatorrent/lib/io/block/FSLineReaderTest.java |  253 --
 .../lib/io/block/FSSliceReaderTest.java            |  178 --
 .../lib/io/block/ReadAheadLineReaderTest.java      |   37 -
 ...stractFileInputOperatorFailureHandlingTest.java |  141 -
 .../lib/io/fs/AbstractFileInputOperatorTest.java   | 1249 ---------
 .../lib/io/fs/AbstractFileOutputOperatorTest.java  | 2073 ---------------
 .../lib/io/fs/AbstractReconcilerTest.java          |  186 --
 .../fs/AbstractSingleFileOutputOperatorTest.java   |  215 --
 .../AbstractThroughputFileInputOperatorTest.java   |  183 --
 .../fs/AbstractWindowFileOutputOperatorTest.java   |  141 -
 .../com/datatorrent/lib/io/fs/BlockWriterTest.java |  167 --
 .../lib/io/fs/FSInputModuleAppTest.java            |  223 --
 .../datatorrent/lib/io/fs/FSInputModuleTest.java   |   57 -
 .../lib/io/fs/FastMergerDecisionMakerTest.java     |  186 --
 .../com/datatorrent/lib/io/fs/FileMergerTest.java  |  258 --
 .../lib/io/fs/FileSplitterBaseTest.java            |  287 --
 .../lib/io/fs/FileSplitterInputTest.java           |  714 -----
 .../datatorrent/lib/io/fs/FileSplitterTest.java    |  448 ----
 .../datatorrent/lib/io/fs/FileStitcherTest.java    |  179 --
 .../lib/io/fs/S3InputModuleAppTest.java            |  257 --
 .../datatorrent/lib/io/fs/SynchronizerTest.java    |  142 -
 .../lib/io/fs/TailFsInputOperatorTest.java         |  245 --
 .../io/jms/FSPsuedoTransactionableStoreTest.java   |   27 -
 .../lib/io/jms/JMSMultiPortOutputOperatorTest.java |  162 --
 .../lib/io/jms/JMSObjectInputOperatorTest.java     |  243 --
 .../lib/io/jms/JMSOutputOperatorTest.java          |  656 -----
 .../lib/io/jms/JMSStringInputOperatorTest.java     |  170 --
 .../com/datatorrent/lib/io/jms/JMSTestBase.java    |  105 -
 .../lib/io/jms/JMSTransactionableStoreTest.java    |   27 -
 .../io/jms/JMSTransactionableStoreTestBase.java    |  281 --
 .../lib/io/jms/SQSStringInputOperatorTest.java     |  263 --
 .../com/datatorrent/lib/io/jms/SQSTestBase.java    |  187 --
 .../datatorrent/lib/join/AntiJoinOperatorTest.java |  120 -
 .../lib/join/MapTimeBasedJoinOperator.java         |  121 -
 .../lib/join/POJOTimeBasedJoinOperatorTest.java    |  389 ---
 .../datatorrent/lib/join/SemiJoinOperatorTest.java |  174 --
 .../logs/ApacheLogParseMapOutputOperatorTest.java  |   97 -
 .../lib/logs/ApacheLogParseOperatorTest.java       |   89 -
 .../lib/logs/FilteredLineToTokenArrayListTest.java |   96 -
 .../lib/logs/FilteredLineToTokenHashMapTest.java   |   91 -
 .../lib/logs/FilteredLineTokenizerKeyValTest.java  |   84 -
 .../lib/logs/LineToTokenArrayListTest.java         |  103 -
 .../lib/logs/LineToTokenHashMapTest.java           |   92 -
 .../lib/logs/LineTokenizerKeyValTest.java          |   81 -
 .../datatorrent/lib/logs/LineTokenizerTest.java    |   59 -
 .../logs/MultiWindowDimensionAggregationTest.java  |  136 -
 .../lib/logs/RegexMatchMapOperatorTest.java        |  156 --
 .../lib/logs/TopNUniqueSiteStatsTest.java          |   92 -
 .../datatorrent/lib/math/AverageKeyValTest.java    |   84 -
 .../java/com/datatorrent/lib/math/AverageTest.java |  105 -
 .../datatorrent/lib/math/CountOccuranceTest.java   |   47 -
 .../com/datatorrent/lib/math/DivisionTest.java     |  101 -
 .../datatorrent/lib/math/LogicalCompareTest.java   |  104 -
 .../lib/math/LogicalCompareToConstantTest.java     |  103 -
 .../com/datatorrent/lib/math/MarginKeyValTest.java |   81 -
 .../com/datatorrent/lib/math/MarginMapTest.java    |   93 -
 .../java/com/datatorrent/lib/math/MarginTest.java  |   92 -
 .../com/datatorrent/lib/math/MaxKeyValTest.java    |  140 -
 .../java/com/datatorrent/lib/math/MaxTest.java     |   82 -
 .../com/datatorrent/lib/math/MinKeyValTest.java    |  138 -
 .../java/com/datatorrent/lib/math/MinTest.java     |   79 -
 .../lib/math/MultiplyByConstantTest.java           |   68 -
 .../com/datatorrent/lib/math/RangeKeyValTest.java  |  111 -
 .../java/com/datatorrent/lib/math/RangeTest.java   |  112 -
 .../datatorrent/lib/math/RunningAverageTest.java   |   76 -
 .../java/com/datatorrent/lib/math/SigmaTest.java   |   75 -
 .../datatorrent/lib/math/SquareCalculusTest.java   |   62 -
 .../com/datatorrent/lib/math/SumKeyValTest.java    |   81 -
 .../java/com/datatorrent/lib/math/SumTest.java     |  104 -
 .../XmlKeyValueStringCartesianProductTest.java     |  141 -
 .../multiwindow/MultiWindowRangeKeyValTest.java    |   67 -
 .../lib/multiwindow/MultiWindowSumKeyValTest.java  |   67 -
 .../lib/multiwindow/SimpleMovingAverageTest.java   |  113 -
 .../lib/multiwindow/SlidingWindowTest.java         |  107 -
 .../lib/multiwindow/SortedMovingWindowTest.java    |  189 --
 .../lib/parser/XmlParserApplicationTest.java       |  118 -
 .../com/datatorrent/lib/parser/XmlParserTest.java  |  394 ---
 .../lib/partitioner/StatelessPartitionerTest.java  |  204 --
 .../StatelessThroughputBasedPartitionerTest.java   |  164 --
 .../datatorrent/lib/projection/ActivateTest.java   |  171 --
 .../datatorrent/lib/projection/ProjectionTest.java |  280 --
 .../lib/script/JavaScriptOperatorTest.java         |   62 -
 .../lib/statistics/MeridianOperatorTest.java       |   50 -
 .../lib/statistics/ModeOperatorTest.java           |   52 -
 .../statistics/StandardDeviationOperatorTest.java  |   51 -
 .../lib/statistics/WeightedMeanOperatorTest.java   |   52 -
 .../lib/stream/ArrayListAggregatorTest.java        |   64 -
 .../lib/stream/ArrayListToItemTest.java            |   58 -
 .../lib/stream/ConsolidatorKeyValTest.java         |   56 -
 .../com/datatorrent/lib/stream/CounterTest.java    |   60 -
 .../datatorrent/lib/stream/DevNullCounterTest.java |   65 -
 .../com/datatorrent/lib/stream/DevNullTest.java    |   53 -
 .../lib/stream/HashMapToKeyValPairTest.java        |   65 -
 .../lib/stream/JsonByteArrayOperatorTest.java      |  106 -
 .../lib/stream/KeyPairToHashMapTest.java           |   59 -
 .../lib/stream/RoundRobinHashMapTest.java          |   91 -
 .../lib/stream/StreamDuplicaterTest.java           |   62 -
 .../datatorrent/lib/stream/StreamMergerTest.java   |   56 -
 .../lib/testbench/ActiveMQMessageGenerator.java    |  148 --
 .../lib/testbench/EventClassifierTest.java         |  257 --
 .../lib/testbench/EventGeneratorTest.java          |  120 -
 .../lib/testbench/EventIncrementerTest.java        |  188 --
 .../lib/testbench/FilteredEventClassifierTest.java |  275 --
 .../lib/testbench/RandomEventGeneratorTest.java    |   88 -
 .../lib/testbench/RandomWordGeneratorTest.java     |   51 -
 .../lib/testbench/SeedEventClassifierTest.java     |  147 --
 .../lib/testbench/SeedEventGeneratorTest.java      |   76 -
 .../lib/testbench/ThroughputCounterTest.java       |  111 -
 .../lib/transform/TransformOperatorAppTest.java    |  136 -
 .../lib/transform/TransformOperatorTest.java       |  356 ---
 .../util/DimensionTimeBucketSumOperatorTest.java   |  100 -
 .../lib/util/JavaScriptFilterOperatorTest.java     |   67 -
 .../datatorrent/lib/util/KryoCloneUtilsTest.java   |  132 -
 .../com/datatorrent/lib/util/PojoUtilsTest.java    |  579 ----
 .../com/datatorrent/lib/util/TestObjAllTypes.java  |  393 ---
 .../java/com/datatorrent/lib/util/TestUtils.java   |  173 --
 .../datatorrent/lib/util/time/WindowUtilsTest.java |  114 -
 .../apex/malhar/lib/algo/BottomNMapTest.java       |  119 +
 .../apex/malhar/lib/algo/BottomNUnifierTest.java   |   64 +
 .../apex/malhar/lib/algo/BottomNUniqueMapTest.java |  121 +
 .../malhar/lib/algo/CompareExceptCountMapTest.java |   82 +
 .../apache/apex/malhar/lib/algo/DistinctTest.java  |   72 +
 .../apex/malhar/lib/algo/FilterValuesTest.java     |  109 +
 .../apex/malhar/lib/algo/InsertSortTest.java       |   83 +
 .../apex/malhar/lib/algo/LeastFrequentKeyTest.java |  110 +
 .../apex/malhar/lib/algo/MatchAllMapTest.java      |   88 +
 .../apex/malhar/lib/algo/MatchAnyMapTest.java      |   88 +
 .../apex/malhar/lib/algo/MergeSortNumberTest.java  |   79 +
 .../apex/malhar/lib/algo/MostFrequentKeyTest.java  |  111 +
 .../org/apache/apex/malhar/lib/algo/TopNTest.java  |  125 +
 .../apex/malhar/lib/algo/TopNUniqueTest.java       |  121 +
 .../apex/malhar/lib/algo/UniqueCounterTest.java    |   94 +
 .../apex/malhar/lib/algo/UniqueValueCountTest.java |   91 +
 .../apex/malhar/lib/appdata/ThreadUtils.java       |   59 +
 .../datastructs/CacheLRUSynchronousFlushTest.java  |  147 ++
 .../appdata/datastructs/DimensionalTableTest.java  |  162 ++
 .../dimensions/CustomTimeBucketRegistryTest.java   |   86 +
 .../appdata/dimensions/DimensionsEventTest.java    |   65 +
 .../malhar/lib/appdata/gpo/GPOMutableTest.java     |   51 +
 .../apex/malhar/lib/appdata/gpo/GPOUtilsTest.java  |  367 +++
 .../lib/appdata/gpo/SerdeFieldsDescriptorTest.java |   50 +
 .../lib/appdata/gpo/SerdeListGPOMutableTest.java   |  116 +
 .../lib/appdata/gpo/SerdeListPrimitiveTest.java    |   58 +
 .../lib/appdata/gpo/SerdeListStringTest.java       |   56 +
 .../apex/malhar/lib/appdata/query/MockQuery.java   |   48 +
 .../apex/malhar/lib/appdata/query/MockResult.java  |   41 +
 .../lib/appdata/query/MockResultSerializer.java    |   56 +
 .../query/QueryManagerAsynchronousTest.java        |  176 ++
 .../appdata/query/QueryManagerSynchronousTest.java |   79 +
 .../malhar/lib/appdata/query/QueueUtilsTest.java   |   92 +
 .../query/SimpleDoneQueryQueueManagerTest.java     |  472 ++++
 .../appdata/query/SimpleQueryQueueManagerTest.java |   49 +
 .../lib/appdata/query/WEQueryQueueManagerTest.java |  269 ++
 .../appdata/query/WindowBoundedServiceTest.java    |   97 +
 .../serde/MessageDeserializerFactoryTest.java      |   72 +
 .../query/serde/SimpleDataValidatorTest.java       |   49 +
 .../lib/appdata/schemas/CustomTimeBucketTest.java  |   82 +
 .../schemas/DataQuerySnapshotDeserializerTest.java |  175 ++
 .../lib/appdata/schemas/DataQuerySnapshotTest.java |   47 +
 .../schemas/DataResultSnapshotSerializerTest.java  |  117 +
 .../DimensionalConfigurationSchemaTest.java        |  513 ++++
 .../lib/appdata/schemas/DimensionalSchemaTest.java |  458 ++++
 .../lib/appdata/schemas/FieldsDescriptorTest.java  |  124 +
 .../lib/appdata/schemas/ResultFormatterTest.java   |   89 +
 .../lib/appdata/schemas/SchemaQueryTest.java       |  109 +
 .../schemas/SchemaRegistryMultipleTest.java        |  146 +
 .../appdata/schemas/SchemaRegistrySingleTest.java  |   44 +
 .../lib/appdata/schemas/SchemaTestUtils.java       |   48 +
 .../lib/appdata/schemas/SchemaUtilsTest.java       |  149 ++
 .../lib/appdata/schemas/SnapshotSchemaTest.java    |   53 +
 .../malhar/lib/appdata/schemas/TimeBucketTest.java |   35 +
 .../snapshot/AppDataSnapshotServerMapTest.java     |  113 +
 .../snapshot/AppDataSnapshotServerPojoTest.java    |   95 +
 .../AppDataSnapshotServerTagsSupportTest.java      |  111 +
 .../malhar/lib/bandwidth/BandwidthManagerTest.java |  270 ++
 .../lib/bandwidth/BandwidthPartitionerTest.java    |  106 +
 .../codec/JavaSerializationStreamCodecTest.java    |  132 +
 .../apex/malhar/lib/codec/KryoStreamCodecTest.java |  119 +
 .../converter/ByteArrayToStringConverterTest.java  |   76 +
 .../converter/MapToKeyValuePairConverterTest.java  |   56 +
 .../StringValueToNumberConverterForMapTest.java    |   64 +
 .../malhar/lib/counters/BasicCountersTest.java     |   83 +
 .../malhar/lib/db/KeyValueStoreOperatorTest.java   |  152 ++
 .../TransactionableKeyValueStoreOperatorTest.java  |   91 +
 .../apex/malhar/lib/db/cache/CacheManagerTest.java |  190 ++
 .../apex/malhar/lib/db/cache/CacheStoreTest.java   |   59 +
 .../db/jdbc/JDBCLookupCacheBackedOperatorTest.java |  208 ++
 .../apache/apex/malhar/lib/db/jdbc/JdbcIOApp.java  |   86 +
 .../apex/malhar/lib/db/jdbc/JdbcIOAppTest.java     |  175 ++
 .../db/jdbc/JdbcInputOperatorApplicationTest.java  |  167 ++
 ...dbcNonTransactionalBatchOutputOperatorTest.java |  439 +++
 .../JdbcNonTransactionalOutputOperatorTest.java    |  161 ++
 .../lib/db/jdbc/JdbcNonTransactionalStoreTest.java |   76 +
 .../apex/malhar/lib/db/jdbc/JdbcOperatorTest.java  |  234 ++
 .../db/jdbc/JdbcPojoOperatorApplicationTest.java   |  128 +
 .../malhar/lib/db/jdbc/JdbcPojoOperatorTest.java   |  693 +++++
 .../lib/db/jdbc/JdbcPojoPollableOpeartorTest.java  |  414 +++
 .../apex/malhar/lib/db/jdbc/JdbcStoreTest.java     |   62 +
 .../RedshiftJdbcTransactionalOperatorTest.java     |    4 +-
 .../lib/dedup/DeduperBoundedPOJOImplTest.java      |    8 +-
 .../apex/malhar/lib/dedup/DeduperOrderingTest.java |    4 +-
 .../malhar/lib/dedup/DeduperPartitioningTest.java  |    2 +-
 .../lib/dedup/DeduperTimeBasedPOJOImplTest.java    |   12 +-
 .../dimensions/CustomTimeBucketRegistryTest.java   |    4 +-
 .../lib/dimensions/DimensionsDescriptorTest.java   |   10 +-
 .../apex/malhar/lib/filter/FilterAppTest.java      |  139 +
 .../apache/apex/malhar/lib/filter/FilterTest.java  |  208 ++
 .../malhar/lib/formatter/JsonFormatterTest.java    |  209 ++
 .../malhar/lib/formatter/XmlFormatterTest.java     |  299 +++
 .../lib/fs/FSRecordCompactionOperatorTest.java     |    4 +-
 .../lib/fs/GenericFileOutputOperatorTest.java      |    2 +-
 .../lib/fs/s3/S3DelimitedRecordReaderTest.java     |    9 +-
 .../lib/fs/s3/S3FixedWidthRecordReaderTest.java    |    9 +-
 .../fs/s3/S3InitiateFileUploadOperatorTest.java    |    8 +-
 .../malhar/lib/fs/s3/S3OutputModuleMockTest.java   |    4 +-
 .../apex/malhar/lib/fs/s3/S3ReconcilerTest.java    |    4 +-
 .../malhar/lib/fs/s3/S3RecordReaderMockTest.java   |    6 +-
 .../lib/helper/OperatorContextTestHelper.java      |  115 +
 .../lib/helper/SamplePubSubWebSocketServlet.java   |  119 +
 .../apex/malhar/lib/helper/TestPortContext.java    |   62 +
 .../apex/malhar/lib/io/ApacheRandomLogsTest.java   |   66 +
 .../malhar/lib/io/FTPStringInputOperatorTest.java  |  105 +
 .../apex/malhar/lib/io/HttpGetMapOperatorTest.java |  115 +
 .../lib/io/HttpJsonChunksInputOperatorTest.java    |  117 +
 .../malhar/lib/io/HttpLinesInputOperatorTest.java  |  110 +
 .../lib/io/HttpMultiValuedMapGetOperatorTest.java  |  237 ++
 .../malhar/lib/io/HttpPostOutputOperatorTest.java  |  111 +
 .../lib/io/IdempotentStorageManagerTest.java       |  201 ++
 .../lib/io/PubSubWebSocketAppDataOperatorTest.java |   75 +
 .../lib/io/PubSubWebSocketAppDataQueryTest.java    |   85 +
 .../lib/io/PubSubWebSocketAppDataResultTest.java   |   30 +
 .../malhar/lib/io/PubSubWebSocketOperatorTest.java |  119 +
 .../apex/malhar/lib/io/SmtpOutputOperatorTest.java |  159 ++
 .../malhar/lib/io/SocketInputOperatorTest.java     |  175 ++
 .../lib/io/WebSocketServerInputOperatorTest.java   |  102 +
 .../lib/io/block/AbstractBlockReaderTest.java      |  202 ++
 .../apex/malhar/lib/io/block/FSLineReaderTest.java |  254 ++
 .../malhar/lib/io/block/FSSliceReaderTest.java     |  178 ++
 .../malhar/lib/io/block/PartFileWriterTest.java    |    5 +-
 .../lib/io/block/ReadAheadLineReaderTest.java      |   37 +
 ...stractFileInputOperatorFailureHandlingTest.java |  141 +
 .../lib/io/fs/AbstractFileInputOperatorTest.java   | 1250 +++++++++
 .../lib/io/fs/AbstractFileOutputOperatorTest.java  | 2073 +++++++++++++++
 .../malhar/lib/io/fs/AbstractReconcilerTest.java   |  186 ++
 .../fs/AbstractSingleFileOutputOperatorTest.java   |  215 ++
 .../AbstractThroughputFileInputOperatorTest.java   |  183 ++
 .../fs/AbstractWindowFileOutputOperatorTest.java   |  142 +
 .../apex/malhar/lib/io/fs/BlockWriterTest.java     |  167 ++
 .../malhar/lib/io/fs/FSInputModuleAppTest.java     |  224 ++
 .../apex/malhar/lib/io/fs/FSInputModuleTest.java   |   57 +
 .../lib/io/fs/FastMergerDecisionMakerTest.java     |  185 ++
 .../apex/malhar/lib/io/fs/FileMergerTest.java      |  258 ++
 .../malhar/lib/io/fs/FileSplitterBaseTest.java     |  287 ++
 .../malhar/lib/io/fs/FileSplitterInputTest.java    |  714 +++++
 .../apex/malhar/lib/io/fs/FileSplitterTest.java    |  448 ++++
 .../apex/malhar/lib/io/fs/FileStitcherTest.java    |  179 ++
 .../malhar/lib/io/fs/S3InputModuleAppTest.java     |  257 ++
 .../apex/malhar/lib/io/fs/SynchronizerTest.java    |  142 +
 .../malhar/lib/io/fs/TailFsInputOperatorTest.java  |  245 ++
 .../io/jms/FSPsuedoTransactionableStoreTest.java   |   27 +
 .../lib/io/jms/JMSMultiPortOutputOperatorTest.java |  163 ++
 .../lib/io/jms/JMSObjectInputOperatorTest.java     |  242 ++
 .../malhar/lib/io/jms/JMSOutputOperatorTest.java   |  656 +++++
 .../lib/io/jms/JMSStringInputOperatorTest.java     |  170 ++
 .../apache/apex/malhar/lib/io/jms/JMSTestBase.java |  105 +
 .../lib/io/jms/JMSTransactionableStoreTest.java    |   27 +
 .../io/jms/JMSTransactionableStoreTestBase.java    |  282 ++
 .../lib/io/jms/SQSStringInputOperatorTest.java     |  263 ++
 .../apache/apex/malhar/lib/io/jms/SQSTestBase.java |  187 ++
 .../apex/malhar/lib/join/AntiJoinOperatorTest.java |  120 +
 .../malhar/lib/join/MapTimeBasedJoinOperator.java  |  122 +
 .../malhar/lib/join/POJOInnerJoinOperatorTest.java |    8 +-
 .../lib/join/POJOPartitionJoinOperatorTest.java    |    2 +-
 .../lib/join/POJOTimeBasedJoinOperatorTest.java    |  389 +++
 .../apex/malhar/lib/join/SemiJoinOperatorTest.java |  174 ++
 .../logs/ApacheLogParseMapOutputOperatorTest.java  |   97 +
 .../lib/logs/ApacheLogParseOperatorTest.java       |   89 +
 .../lib/logs/FilteredLineToTokenArrayListTest.java |   96 +
 .../lib/logs/FilteredLineToTokenHashMapTest.java   |   91 +
 .../lib/logs/FilteredLineTokenizerKeyValTest.java  |   84 +
 .../malhar/lib/logs/LineToTokenArrayListTest.java  |  103 +
 .../malhar/lib/logs/LineToTokenHashMapTest.java    |   92 +
 .../malhar/lib/logs/LineTokenizerKeyValTest.java   |   81 +
 .../apex/malhar/lib/logs/LineTokenizerTest.java    |   59 +
 .../logs/MultiWindowDimensionAggregationTest.java  |  135 +
 .../malhar/lib/logs/RegexMatchMapOperatorTest.java |  156 ++
 .../malhar/lib/logs/TopNUniqueSiteStatsTest.java   |   91 +
 .../apex/malhar/lib/math/AverageKeyValTest.java    |   84 +
 .../apache/apex/malhar/lib/math/AverageTest.java   |  105 +
 .../apex/malhar/lib/math/CountOccuranceTest.java   |   47 +
 .../apache/apex/malhar/lib/math/DivisionTest.java  |  101 +
 .../apex/malhar/lib/math/LogicalCompareTest.java   |  105 +
 .../lib/math/LogicalCompareToConstantTest.java     |  103 +
 .../apex/malhar/lib/math/MarginKeyValTest.java     |   81 +
 .../apache/apex/malhar/lib/math/MarginMapTest.java |   93 +
 .../apache/apex/malhar/lib/math/MarginTest.java    |   92 +
 .../apache/apex/malhar/lib/math/MaxKeyValTest.java |  141 +
 .../org/apache/apex/malhar/lib/math/MaxTest.java   |   82 +
 .../apache/apex/malhar/lib/math/MinKeyValTest.java |  139 +
 .../org/apache/apex/malhar/lib/math/MinTest.java   |   79 +
 .../malhar/lib/math/MultiplyByConstantTest.java    |   68 +
 .../apex/malhar/lib/math/RangeKeyValTest.java      |  111 +
 .../org/apache/apex/malhar/lib/math/RangeTest.java |  112 +
 .../apex/malhar/lib/math/RunningAverageTest.java   |   76 +
 .../org/apache/apex/malhar/lib/math/SigmaTest.java |   75 +
 .../apex/malhar/lib/math/SquareCalculusTest.java   |   62 +
 .../apache/apex/malhar/lib/math/SumKeyValTest.java |   81 +
 .../org/apache/apex/malhar/lib/math/SumTest.java   |  104 +
 .../XmlKeyValueStringCartesianProductTest.java     |  141 +
 .../multiwindow/MultiWindowRangeKeyValTest.java    |   67 +
 .../lib/multiwindow/MultiWindowSumKeyValTest.java  |   67 +
 .../lib/multiwindow/SimpleMovingAverageTest.java   |  113 +
 .../malhar/lib/multiwindow/SlidingWindowTest.java  |  107 +
 .../lib/multiwindow/SortedMovingWindowTest.java    |  188 ++
 .../lib/parser/XmlParserApplicationTest.java       |  120 +
 .../apex/malhar/lib/parser/XmlParserTest.java      |  394 +++
 .../lib/partitioner/StatelessPartitionerTest.java  |  205 ++
 .../StatelessThroughputBasedPartitionerTest.java   |  165 ++
 .../apex/malhar/lib/projection/ActivateTest.java   |  171 ++
 .../apex/malhar/lib/projection/ProjectionTest.java |  280 ++
 .../malhar/lib/script/JavaScriptOperatorTest.java  |   62 +
 .../lib/state/managed/BucketsFileSystemTest.java   |    5 +-
 .../lib/state/managed/DefaultBucketTest.java       |    6 +-
 .../managed/IncrementalCheckpointManagerTest.java  |    6 +-
 .../lib/state/managed/ManagedStateImplTest.java    |    7 +-
 .../lib/state/managed/ManagedStateTestUtils.java   |    6 +-
 .../state/managed/ManagedTimeStateImplTest.java    |    8 +-
 .../managed/ManagedTimeUnifiedStateImplTest.java   |    4 +-
 .../lib/state/managed/MockManagedStateContext.java |    7 +-
 .../MovingBoundaryTimeBucketAssignerTest.java      |    3 +-
 .../malhar/lib/state/managed/StateTrackerTest.java |    5 +-
 ...SequentialSpillableIdentifierGeneratorTest.java |    2 +-
 .../spillable/SpillableArrayListImplTest.java      |    7 +-
 .../SpillableArrayListMultimapImplTest.java        |    4 +-
 .../lib/state/spillable/SpillableMapImplTest.java  |    4 +-
 .../spillable/SpillableSetMultimapImplTest.java    |    7 +-
 .../lib/state/spillable/SpillableTestUtils.java    |    4 +-
 .../inmem/InMemorySpillableStateStoreTest.java     |    2 +-
 .../lib/statistics/MeridianOperatorTest.java       |   50 +
 .../malhar/lib/statistics/ModeOperatorTest.java    |   52 +
 .../statistics/StandardDeviationOperatorTest.java  |   51 +
 .../lib/statistics/WeightedMeanOperatorTest.java   |   52 +
 .../malhar/lib/stream/ArrayListAggregatorTest.java |   64 +
 .../malhar/lib/stream/ArrayListToItemTest.java     |   58 +
 .../malhar/lib/stream/ConsolidatorKeyValTest.java  |   56 +
 .../apache/apex/malhar/lib/stream/CounterTest.java |   60 +
 .../apex/malhar/lib/stream/DevNullCounterTest.java |   65 +
 .../apache/apex/malhar/lib/stream/DevNullTest.java |   53 +
 .../malhar/lib/stream/HashMapToKeyValPairTest.java |   65 +
 .../lib/stream/JsonByteArrayOperatorTest.java      |  106 +
 .../malhar/lib/stream/KeyPairToHashMapTest.java    |   59 +
 .../malhar/lib/stream/RoundRobinHashMapTest.java   |   91 +
 .../malhar/lib/stream/StreamDuplicaterTest.java    |   62 +
 .../apex/malhar/lib/stream/StreamMergerTest.java   |   56 +
 .../lib/testbench/ActiveMQMessageGenerator.java    |  148 ++
 .../malhar/lib/testbench/EventClassifierTest.java  |  257 ++
 .../malhar/lib/testbench/EventGeneratorTest.java   |  120 +
 .../malhar/lib/testbench/EventIncrementerTest.java |  188 ++
 .../lib/testbench/FilteredEventClassifierTest.java |  275 ++
 .../lib/testbench/RandomEventGeneratorTest.java    |   88 +
 .../lib/testbench/RandomWordGeneratorTest.java     |   51 +
 .../lib/testbench/SeedEventClassifierTest.java     |  147 ++
 .../lib/testbench/SeedEventGeneratorTest.java      |   76 +
 .../lib/testbench/ThroughputCounterTest.java       |  111 +
 .../lib/transform/TransformOperatorAppTest.java    |  137 +
 .../lib/transform/TransformOperatorTest.java       |  357 +++
 .../util/DimensionTimeBucketSumOperatorTest.java   |   99 +
 .../lib/util/JavaScriptFilterOperatorTest.java     |   67 +
 .../apex/malhar/lib/util/KryoCloneUtilsTest.java   |  132 +
 .../apache/apex/malhar/lib/util/PojoUtilsTest.java |  579 ++++
 .../apex/malhar/lib/util/TestObjAllTypes.java      |  393 +++
 .../org/apache/apex/malhar/lib/util/TestUtils.java |  173 ++
 .../apex/malhar/lib/util/time/WindowUtilsTest.java |  114 +
 .../malhar/lib/wal/FSWindowDataManagerTest.java    |    5 +-
 .../apex/malhar/lib/wal/FileSystemWALTest.java     |    2 +-
 .../lib/window/SpillableWindowedStorageTest.java   |    2 +-
 .../malhar/lib/window/WindowedOperatorTest.java    |    4 +-
 .../lib/window/accumulation/PojoInnerJoinTest.java |    4 +-
 .../lib/window/accumulation/PojoOuterJoinTest.java |    4 +-
 .../lib/window/accumulation/TopNByKeyTest.java     |    2 +-
 .../KeyedWindowedMergeOperatorTestApplication.java |    4 +-
 .../lib/window/impl/WindowedMergeOperatorTest.java |    5 +-
 .../impl/WindowedMergeOperatorTestApplication.java |    2 +-
 .../malhar/lib/window/sample/pi/Application.java   |    2 +-
 .../lib/window/sample/wordcount/Application.java   |    4 +-
 pom.xml                                            |    4 +-
 samples/pom.xml                                    |   55 -
 .../samples/lib/algo/AllAfterMatchMapSample.java   |   65 -
 .../samples/lib/algo/BottomNMapSample.java         |   65 -
 .../datatorrent/samples/lib/algo/package-info.java |   25 -
 .../samples/lib/io/HttpInputOperatorSample.java    |   64 -
 .../datatorrent/samples/lib/io/package-info.java   |   24 -
 .../samples/lib/math/AverageKeyValSample.java      |   64 -
 .../samples/lib/math/AverageSample.java            |   70 -
 .../datatorrent/samples/lib/math/ChangeSample.java |   70 -
 .../samples/lib/math/CompreMapSample.java          |   61 -
 .../samples/lib/math/CountKeyValSample.java        |   62 -
 .../samples/lib/math/CountKeyValues.java           |   88 -
 .../samples/lib/math/LogicalCompareSample.java     |   62 -
 .../samples/lib/math/PartitionMathSumSample.java   |   71 -
 .../lib/math/RandomEvenetGeneratorSample.java      |   57 -
 .../samples/lib/math/RandomKeyValMap.java          |   84 -
 .../samples/lib/math/RandomKeyValues.java          |   84 -
 .../samples/lib/math/RandomPairIntegers.java       |   84 -
 .../datatorrent/samples/lib/math/ScriptSample.java |   61 -
 .../samples/lib/math/SingleKeyValMap.java          |   82 -
 .../datatorrent/samples/lib/math/package-info.java |   25 -
 .../java/com/datatorrent/samples/package-info.java |   25 -
 .../lib/math/PartitionMathSumSampleTest.java       |   44 -
 samples/src/test/resources/log4j.properties        |   43 -
 sql/pom.xml                                        |    2 +-
 .../malhar/sql/codegen/ExpressionCompiler.java     |    2 +-
 .../sql/operators/FilterTransformOperator.java     |    6 +-
 .../apex/malhar/sql/operators/LineReader.java      |    2 +-
 .../apex/malhar/sql/planner/ApexRelNode.java       |    2 +-
 .../apex/malhar/sql/table/CSVMessageFormat.java    |    6 +-
 .../apache/apex/malhar/sql/KafkaEndpointTest.java  |    4 +-
 .../java/org/apache/apex/malhar/sql/SerDeTest.java |    4 +-
 .../apache/apex/malhar/sql/StreamEndpointTest.java |    4 +-
 stream/pom.xml                                     |    2 +-
 .../apex/malhar/stream/api/WindowedStream.java     |    3 +-
 .../malhar/stream/api/impl/ApexStreamImpl.java     |    2 +-
 .../stream/api/impl/ApexWindowedStreamImpl.java    |    3 +-
 .../apex/malhar/stream/api/impl/StreamFactory.java |    2 +-
 .../stream/sample/ApplicationWithStreamAPI.java    |    2 +-
 .../sample/LocalTestWithoutStreamApplication.java  |    3 +-
 .../apex/malhar/stream/sample/MyStreamTest.java    |    3 +-
 .../stream/sample/WordCountWithStreamAPI.java      |    2 +-
 2706 files changed, 173333 insertions(+), 174623 deletions(-)
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/ApplicationFixed.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/Benchmark.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseAppInput.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseAppOutput.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseInputOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseOutputOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/FixedTuplesInputOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/RandomMapOutput.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/RandomWordInputModule.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/WordCountOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/aerospike/AerospikeOutputOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkApplication.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/cassandra/CassandraOutputBenchmarkApplication.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/cassandra/CassandraOutputOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/fs/FSByteOutputOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/fs/FSOutputOperatorBenchmark.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/hive/HiveInsertBenchmarkingApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/hive/HiveMapInsertBenchmarkingApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/kafka/BenchmarkKafkaInputOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/kafka/KafkaInputBenchmark.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/kafka/KafkaOutputBenchmark.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/kafka/KafkaTestPartitioner.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/package-info.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkApplication.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/spillable/SpillableBenchmarkApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/spillable/SpillableTestInputOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/spillable/SpillableTestOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/state/ManagedStateBenchmarkApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/state/StoreOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/stream/DevNullCounterBenchmark.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/stream/IntegerOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/stream/StreamDuplicaterApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/stream/StreamMergeApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventClassifierApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventGeneratorApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventIncrementerApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/FilterClassifierApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/FilteredEventClassifierApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/HashMapOperator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/RandomEventGeneratorApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/SeedEventGeneratorApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/testbench/ThroughputCounterApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/window/AbstractGenerator.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java
 delete mode 100644 benchmark/src/main/java/com/datatorrent/benchmark/window/WindowedOperatorBenchmarkApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/ApplicationFixed.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/Benchmark.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppInput.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppOutput.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseInputOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseOutputOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/FixedTuplesInputOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/RandomMapOutput.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/RandomWordInputModule.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/WordCountOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkApplication.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputBenchmarkApplication.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/fs/FSByteOutputOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/fs/FSOutputOperatorBenchmark.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkingApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveMapInsertBenchmarkingApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkKafkaInputOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmark.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmark.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaTestPartitioner.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/package-info.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkApplication.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestInputOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/state/StoreOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/stream/DevNullCounterBenchmark.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/stream/IntegerOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamDuplicaterApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamMergeApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventGeneratorApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventIncrementerApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilterClassifierApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/HashMapOperator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/RandomEventGeneratorApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/SeedEventGeneratorApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/testbench/ThroughputCounterApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractGenerator.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java
 rename benchmark/src/main/java/{com/datatorrent => org/apache/apex}/benchmark/window/README.md (100%)
 create mode 100644 benchmark/src/main/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkApp.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/ApplicationFixedTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/BenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/CouchBaseBenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloApp.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/aerospike/AerospikeBenchmarkAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/cassandra/CassandraApplicatonTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/hbase/HBaseApplicationTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/hbase/HBaseCsvMappingApplication.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/hive/HiveInsertBenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/hive/HiveMapBenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/kafka/KafkaInputBenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/kafka/KafkaOutputBenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmark.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmark.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/spillable/SpillableBenchmarkAppTester.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/spillable/SpillableDSBenchmarkTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/state/ManagedStateBenchmarkAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventClassifierAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventGeneratorAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventIncrementerAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilterClassifierAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilteredEventClassifierAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/testbench/ThroughputCounterAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/util/serde/GenericSerdePerformanceTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java
 delete mode 100644 benchmark/src/test/java/com/datatorrent/benchmark/window/WindowedOperatorBenchmarkAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/ApplicationFixedTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/BenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/CouchBaseBenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloApp.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/aerospike/AerospikeBenchmarkAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/cassandra/CassandraApplicatonTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseApplicationTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseCsvMappingApplication.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveMapBenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmark.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmark.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkAppTester.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableDSBenchmarkTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventGeneratorAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventIncrementerAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilterClassifierAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/testbench/ThroughputCounterAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/util/serde/GenericSerdePerformanceTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java
 create mode 100644 benchmark/src/test/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkAppTest.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/accumulo/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/aerospike/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/apachelog/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/apachelog/zmq/Application.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/avro/AvroFileInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/avro/AvroFileToPojoModule.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/avro/AvroRecordHelper.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/avro/AvroToPojo.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/avro/PojoToAvro.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPojoUtils.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPreparedStatementGenerator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/ConnectionStateManager.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/UpsertExecutionContext.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/cassandra/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/AbstractCouchBaseInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/AbstractCouchBaseOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/AbstractCouchBaseSetOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseJSONSerializer.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseSerializer.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseWindowStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchbase/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchdb/MapBasedCouchDbOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/couchdb/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchConnectable.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchMapInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchMapOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/elasticsearch/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/AbstractEnricher.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/BackendLoader.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/DelimitedFSLoader.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/FSLoader.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/FixedWidthFSLoader.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/JDBCLoader.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/JsonFSLoader.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/MapEnricher.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/NullValuesCacheManager.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/POJOEnricher.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/enrich/ReadOnlyBackup.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/formatter/CsvFormatter.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/geode/AbstractGeodeInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/geode/AbstractGeodeOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/geode/GeodeCheckpointStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/geode/GeodeKeyValueStorageAgent.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/geode/GeodePOJOOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/geode/GeodeStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/geode/RegionCreateFunction.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldInfo.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldValueGenerator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/OutputAdapter.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/hbase/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/jython/PythonOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/jython/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/HighlevelKafkaConsumer.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaConsumer.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaJsonEncoder.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaMetadataUtil.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaPartition.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortByteArrayInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortStringInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/OffsetManager.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/POJOKafkaOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/SimpleKafkaConsumer.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kafka/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/AbstractKinesisInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/AbstractKinesisOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisConsumer.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisUtil.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/ShardManager.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/kinesis/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memcache/MemcacheStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memcache/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/MemcacheStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/memsql/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBConnectable.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mongodb/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractMqttInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractMqttOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mqtt/MqttClientConfig.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/mqtt/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/nifi/AbstractNiFiInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/nifi/AbstractNiFiOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/nifi/AbstractNiFiSinglePortInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiDataPacket.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiDataPacketBuilder.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/nifi/StandardNiFiDataPacket.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parquet/AbstractParquetFileReader.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReader.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/AbstractCsvParser.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/CellProcessorBuilder.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/CsvParser.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/DelimitedSchema.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/FixedWidthParser.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/FixedWidthSchema.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/JsonParser.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/RegexParser.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/Schema.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/parser/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/r/REngineConnectable.java
 delete mode 100755 contrib/src/main/java/com/datatorrent/contrib/r/RMax.java
 delete mode 100755 contrib/src/main/java/com/datatorrent/contrib/r/RMin.java
 delete mode 100755 contrib/src/main/java/com/datatorrent/contrib/r/RScript.java
 delete mode 100755 contrib/src/main/java/com/datatorrent/contrib/r/RStandardDeviation.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/r/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/rabbitmq/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/LettuceStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/NumberSummation.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/RedisStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/redis/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/romesyndication/RomeFeedEntry.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/romesyndication/RomeStreamProvider.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/romesyndication/RomeSyndicationOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/romesyndication/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/ruby/RubyOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/AbstractSolrInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/AbstractSolrOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/CloudSolrServerConnector.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/ConcurrentUpdateSolrServerConnector.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/HttpSolrServerConnector.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/LBHttpSolrServerConnector.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/SolrInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/SolrOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/SolrServerConnector.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/solr/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarder.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkStore.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/splunk/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/sqlite/SqliteStreamOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/sqlite/package-info.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/twitter/TwitterSampleInput.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractBaseZeroMQInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractBaseZeroMQOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/zmq/SimpleSinglePortZeroMQPullInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/zmq/SimpleSinglePortZeroMQPullStringInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQInputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperator.java
 delete mode 100644 contrib/src/main/java/com/datatorrent/contrib/zmq/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloWindowStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeGetOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTransactionalStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGenerator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLog.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGenerator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/GeoIPExtractor.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/TimestampExtractor.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/UserAgentExtractor.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/zmq/Application.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileToPojoModule.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroRecordHelper.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroToPojo.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/avro/PojoToAvro.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPojoUtils.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPreparedStatementGenerator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraTransactionalStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/ConnectionStateManager.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/UpsertExecutionContext.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseSetOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseJSONSerializer.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSerializer.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseWindowStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchbasePOJOSetOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractMapBasedInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDbStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/MapBasedCouchDbOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchConnectable.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/AbstractEnricher.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/BackendLoader.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/DelimitedFSLoader.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FSLoader.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FixedWidthFSLoader.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JDBCLoader.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JsonFSLoader.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/MapEnricher.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/NullValuesCacheManager.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/POJOEnricher.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/ReadOnlyBackup.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/formatter/CsvFormatter.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgent.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/geode/RegionCreateFunction.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseAppendOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBasePutOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldInfo.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldValueGenerator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseOperatorBase.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseWindowStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/OutputAdapter.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/jython/PythonOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/jython/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/HighlevelKafkaConsumer.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaConsumer.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaJsonEncoder.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaMetadataUtil.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaPartition.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaSinglePortByteArrayInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaSinglePortOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaSinglePortStringInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/OffsetManager.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/POJOKafkaOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/SimpleKafkaConsumer.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/AbstractKinesisInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/AbstractKinesisOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisByteArrayInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisByteArrayOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisConsumer.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisStringInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisStringOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisUtil.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/ShardManager.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/AbstractMemcacheInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/AbstractMemcacheOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/MemcachePOJOOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/MemcacheStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/MemcacheStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/MemsqlPOJOInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/MemsqlPOJOOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/MemsqlStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/misc/algo/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/misc/math/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBArrayListOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBConnectable.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBHashMapOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBPOJOOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractMqttInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractMqttOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractSinglePortMqttInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/MqttClientConfig.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/AbstractNiFiInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/AbstractNiFiOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/AbstractNiFiSinglePortInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiDataPacket.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiDataPacketBuilder.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/StandardNiFiDataPacket.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parquet/AbstractParquetFileReader.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parquet/ParquetFilePOJOReader.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parser/AbstractCsvParser.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parser/CellProcessorBuilder.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parser/CsvParser.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parser/DelimitedSchema.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parser/FixedWidthParser.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parser/FixedWidthSchema.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parser/JsonParser.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parser/RegexParser.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/parser/Schema.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/r/REngineConnectable.java
 create mode 100755 contrib/src/main/java/org/apache/apex/malhar/contrib/r/RMax.java
 create mode 100755 contrib/src/main/java/org/apache/apex/malhar/contrib/r/RMin.java
 create mode 100755 contrib/src/main/java/org/apache/apex/malhar/contrib/r/RScript.java
 create mode 100755 contrib/src/main/java/org/apache/apex/malhar/contrib/r/RStandardDeviation.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/r/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/AbstractRedisAggregateOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/AbstractRedisInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/LettuceStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/NumberSummation.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisKeyValPairOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisKeyValueInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisMapAsValueInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisMapOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisNumberSummationMapOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisPOJOInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisPOJOOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/redis/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/RomeFeedEntry.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/RomeStreamProvider.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/RomeSyndicationOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/ruby/RubyOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/AbstractSolrInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/AbstractSolrOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/CloudSolrServerConnector.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/ConcurrentUpdateSolrServerConnector.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/HttpSolrServerConnector.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/LBHttpSolrServerConnector.java
 rename contrib/src/main/java/{com/datatorrent => org/apache/apex/malhar}/contrib/solr/README.md (100%)
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/SolrInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/SolrOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/SolrServerConnector.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/solr/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/AbstractSplunkInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkInputFromForwarder.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkStore.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkTcpOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/sqlite/SqliteStreamOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/sqlite/package-info.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/twitter/TwitterSampleInput.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractBaseZeroMQInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractBaseZeroMQOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractSinglePortZeroMQOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/SimpleSinglePortZeroMQPullInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/SimpleSinglePortZeroMQPullStringInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/ZeroMQInputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/ZeroMQOutputOperator.java
 create mode 100644 contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/package-info.java
 rename contrib/src/main/resources/{com/datatorrent => org/apache/apex/malhar}/contrib/apachelog/agents.txt (100%)
 rename contrib/src/main/resources/{com/datatorrent => org/apache/apex/malhar}/contrib/apachelog/ipaddress.txt (100%)
 rename contrib/src/main/resources/{com/datatorrent => org/apache/apex/malhar}/contrib/apachelog/referers.txt (100%)
 rename contrib/src/main/resources/{com/datatorrent => org/apache/apex/malhar}/contrib/apachelog/urls.txt (100%)
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloRowTupleGenerator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloTestHelper.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloTuple.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloTupleCollector.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeTestUtils.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/apachelog/ApacheLogInputGeneratorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/apachelog/ApplicationLocalLogTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/apachelog/ApplicationLogGeneratorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/apachelog/zmq/ApplicationTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/avro/AvroFileInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/avro/AvroFileToPojoModuleTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/avro/AvroToPojoTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/avro/PojoToAvroTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/Address.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/AddressCodec.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/CompositePrimaryKeyRow.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/CompositePrimaryKeyUpdateOperator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/CounterColumnTableEntry.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/CounterColumnUpdatesOperator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/FullName.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/FullNameCodec.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/TestInputPojo.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/User.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/cassandra/UserUpsertOperator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseGetTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBasePOJOTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseSetTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchbase/TestComplexPojoInput.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchbase/TestPojo.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBTestHelper.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchdb/PagedCouchDBInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/couchdb/TestInputPOJO.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/elasticsearch/ElasticSearchOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolateTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/enrich/EmployeeOrder.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/enrich/FileEnrichmentTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/enrich/JDBCLoaderTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/enrich/MapEnricherTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/enrich/Order.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/enrich/POJOEnricherTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/formatter/CsvFormatterTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/geode/GeodeCheckpointStoreTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/geode/GeodeKeyValueStorageAgentTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/geode/GeodeOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/geode/GeodePOJOOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/geode/GeodeStoreTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseColTupleGenerator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseGetOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowStringGenerator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowTupleGenerator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseScanOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTestHelper.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalAppendOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalPutOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTuple.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTupleCollector.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseUtil.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/helper/CollectorModule.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/helper/MessageQueueTestHelper.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/helper/SourceModule.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/jython/PythonOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaExactlyOnceOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaOperatorTestBase.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaPartitionableInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaSimpleConsumer.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaTestConsumer.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaTestPartitioner.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaTestProducer.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/OffsetManagerTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kafka/SimpleKakfaConsumerTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisOperatorTestBase.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisPartitionableInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisTestConsumer.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisTestProducer.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/kinesis/ShardManagerTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/memcache/MemcacheOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/memcache/MemcachePOJOOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/memcache_whalin/MemcacheWhalinOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/memsql/MemsqlInputOperator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/memsql/MemsqlStoreTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/memsql/TestInputPojo.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/mongodb/TestPOJO.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/mqtt/MqttInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/mqtt/MqttOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/nifi/demo/TestNiFiInputApplication.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/nifi/demo/TestNiFiOutputApplication.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/nifi/mock/MockDataPacket.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/nifi/mock/MockSiteToSiteClient.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/nifi/mock/MockTransaction.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReaderTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/parser/CSVParserTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/parser/CsvPOJOParserTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/parser/FixedWidthTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/parser/JsonParserApplicationTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/parser/JsonParserTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/parser/RegexParserTest.java
 delete mode 100755 contrib/src/test/java/com/datatorrent/contrib/r/RMaxOperatorTest.java
 delete mode 100755 contrib/src/test/java/com/datatorrent/contrib/r/RMinOperatorTest.java
 delete mode 100755 contrib/src/test/java/com/datatorrent/contrib/r/RScriptLinearRegressionPredictorTest.java
 delete mode 100755 contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorBooleanTest.java
 delete mode 100755 contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorDoubleArrayTest.java
 delete mode 100755 contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorIntTest.java
 delete mode 100755 contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorRealTest.java
 delete mode 100755 contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorStrTest.java
 delete mode 100755 contrib/src/test/java/com/datatorrent/contrib/r/RStandardDeviationOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorBenchmark.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorBenchmark.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/redis/RedisOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/romesyndication/RomeSyndicationOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/ruby/RubyOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarderTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/util/FieldValueSerializableGenerator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/util/POJOTupleGenerateOperator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/util/TestPOJO.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/util/TupleCacheOutputOperator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/util/TupleGenerateCacheOperator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/util/TupleGenerator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQInputOperatorBenchmark.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQInputOperatorTest.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQMessageGenerator.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQMessageReceiver.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperatorBenchmark.java
 delete mode 100644 contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloRowTupleGenerator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloTestHelper.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloTuple.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloTupleCollector.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikeOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTestUtils.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGeneratorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLogTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGeneratorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/zmq/ApplicationTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/avro/AvroFileToPojoModuleTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/avro/AvroToPojoTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/avro/PojoToAvroTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/Address.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AddressCodec.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CassandraOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CompositePrimaryKeyRow.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CompositePrimaryKeyUpdateOperator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CounterColumnTableEntry.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CounterColumnUpdatesOperator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/FullName.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/FullNameCodec.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/TestInputPojo.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/User.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/UserUpsertOperator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseGetTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSetTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/TestComplexPojoInput.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/TestPojo.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBTestHelper.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/PagedCouchDBInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/TestInputPOJO.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolateTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/EmployeeOrder.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/FileEnrichmentTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/JDBCLoaderTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/MapEnricherTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/Order.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/POJOEnricherTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/formatter/CsvFormatterTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStoreTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgentTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeStoreTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseColTupleGenerator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseRowStringGenerator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseRowTupleGenerator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTestHelper.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTransactionalAppendOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTransactionalPutOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTuple.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTupleCollector.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseUtil.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/helper/CollectorModule.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/helper/MessageQueueTestHelper.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/helper/SourceModule.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/jython/PythonOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaExactlyOnceOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaOperatorTestBase.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaPartitionableInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaSimpleConsumer.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaTestConsumer.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaTestPartitioner.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaTestProducer.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/OffsetManagerTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/SimpleKakfaConsumerTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisByteArrayOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisOperatorTestBase.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisPartitionableInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisStringOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisTestConsumer.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisTestProducer.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/ShardManagerTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/memcache/MemcacheOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/memcache/MemcachePOJOOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/memcache_whalin/MemcacheWhalinOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/MemsqlInputOperator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/MemsqlStoreTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/TestInputPojo.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/mongodb/MongoDBInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/mongodb/MongoDBOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/mongodb/TestPOJO.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/mqtt/MqttInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/mqtt/MqttOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/demo/TestNiFiInputApplication.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/demo/TestNiFiOutputApplication.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/mock/MockDataPacket.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/mock/MockSiteToSiteClient.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/mock/MockTransaction.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/parquet/ParquetFilePOJOReaderTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/parser/CSVParserTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/parser/CsvPOJOParserTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/parser/FixedWidthTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/parser/JsonParserApplicationTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/parser/JsonParserTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/parser/RegexParserTest.java
 create mode 100755 contrib/src/test/java/org/apache/apex/malhar/contrib/r/RMaxOperatorTest.java
 create mode 100755 contrib/src/test/java/org/apache/apex/malhar/contrib/r/RMinOperatorTest.java
 create mode 100755 contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptLinearRegressionPredictorTest.java
 create mode 100755 contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorBooleanTest.java
 create mode 100755 contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorDoubleArrayTest.java
 create mode 100755 contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorIntTest.java
 create mode 100755 contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorRealTest.java
 create mode 100755 contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorStrTest.java
 create mode 100755 contrib/src/test/java/org/apache/apex/malhar/contrib/r/RStandardDeviationOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQInputOperatorBenchmark.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQOutputOperatorBenchmark.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/redis/RedisInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/redis/RedisOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/redis/RedisPOJOOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/romesyndication/RomeSyndicationOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/ruby/RubyOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/splunk/SplunkInputFromForwarderTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/splunk/SplunkInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/splunk/SplunkTcpOutputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/util/FieldValueSerializableGenerator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/util/POJOTupleGenerateOperator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/util/TestPOJO.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/util/TupleCacheOutputOperator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/util/TupleGenerateCacheOperator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/util/TupleGenerator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQInputOperatorBenchmark.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQInputOperatorTest.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQMessageGenerator.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQMessageReceiver.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQOutputOperatorBenchmark.java
 create mode 100644 contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQOutputOperatorTest.java
 delete mode 100755 hive/src/main/java/com/datatorrent/contrib/hive/AbstractFSRollingOutputOperator.java
 delete mode 100644 hive/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
 delete mode 100755 hive/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
 delete mode 100755 hive/src/main/java/com/datatorrent/contrib/hive/HiveStore.java
 delete mode 100755 hive/src/main/java/com/datatorrent/contrib/hive/HiveStreamCodec.java
 delete mode 100644 hive/src/main/java/com/datatorrent/contrib/hive/package-info.java
 create mode 100755 hive/src/main/java/org/apache/apex/malhar/hive/AbstractFSRollingOutputOperator.java
 create mode 100644 hive/src/main/java/org/apache/apex/malhar/hive/FSPojoToHiveOperator.java
 create mode 100755 hive/src/main/java/org/apache/apex/malhar/hive/HiveOperator.java
 create mode 100755 hive/src/main/java/org/apache/apex/malhar/hive/HiveStore.java
 create mode 100755 hive/src/main/java/org/apache/apex/malhar/hive/HiveStreamCodec.java
 create mode 100644 hive/src/main/java/org/apache/apex/malhar/hive/package-info.java
 delete mode 100755 hive/src/test/java/com/datatorrent/contrib/hive/FSRollingMapTestImpl.java
 delete mode 100755 hive/src/test/java/com/datatorrent/contrib/hive/FSRollingTestImpl.java
 delete mode 100755 hive/src/test/java/com/datatorrent/contrib/hive/HiveMockTest.java
 delete mode 100755 hive/src/test/java/com/datatorrent/contrib/hive/HiveStoreTest.java
 create mode 100755 hive/src/test/java/org/apache/apex/malhar/hive/FSRollingMapTestImpl.java
 create mode 100755 hive/src/test/java/org/apache/apex/malhar/hive/FSRollingTestImpl.java
 create mode 100755 hive/src/test/java/org/apache/apex/malhar/hive/HiveMockTest.java
 create mode 100755 hive/src/test/java/org/apache/apex/malhar/hive/HiveStoreTest.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/BottomNMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/BottomNUnifier.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/BottomNUniqueMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/CompareExceptCountMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/Distinct.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/FilterValues.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/InsertSort.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyArrayUnifier.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyUnifier.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/LeastFrequentValue.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/MatchAllMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/MatchAnyMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/MergeSort.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/MergeSortNumber.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/MostFrequentValue.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/TopN.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/TopNUnique.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/UniqueCounter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/UniqueValueCount.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/algo/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/QueueUtils.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/StoreUtils.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlush.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/datastructs/DimensionalTable.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/datastructs/NOPCacheFlushListener.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOByteArrayList.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOGetters.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOMutable.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOType.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOUtils.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/Serde.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptor.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutable.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitive.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListString.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeMapPrimitive.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeObjectPayloadFix.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/AppDataWindowEndQueueManager.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/QueryBundle.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/QueryExecutor.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronous.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronous.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/QueueList.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/QueueManager.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/SimpleDoneQueueManager.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/SimpleQueueManager.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/WindowBoundedService.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/WindowEndQueueManager.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageDeserializer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageSerializer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageValidator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataResultSnapshotSerializer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactory.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerInfo.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerFactory.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerInfo.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageType.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageValidatorInfo.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/SchemaQueryDeserializer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataDeserializer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataSerializer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/CustomTimeBucket.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshot.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/DimensionalConfigurationSchema.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/DimensionalSchema.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/JSONType.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/Message.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/QRBase.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/Query.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/Result.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/ResultFormatter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/Schema.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaQuery.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistry.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultiple.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingle.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResult.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResultSerializer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/TimeBucket.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/schemas/Type.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/bandwidth/BandwidthLimitingOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/bandwidth/BandwidthManager.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/bandwidth/BandwidthPartitioner.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/codec/JavaSerializationStreamCodec.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/codec/KryoJdkContainer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/codec/KryoSerializableStreamCodec.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/codec/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/converter/ByteArrayToStringConverterOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/converter/Converter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/converter/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/counters/BasicCounters.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/counters/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/AbstractBatchTransactionableStoreOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/AbstractKeyValueStoreInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/AbstractStoreInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/AbstractStoreOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/AbstractTransactionableStoreOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/Connectable.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/KeyValueStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/Transactionable.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/TransactionableKeyValueStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/TransactionableStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/cache/AbstractDBLookupCacheBackedOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/cache/CacheManager.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/cache/CacheStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/cache/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableBatchOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPollInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCDimensionalOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcFieldInfo.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOPollInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPollInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcTransactionalStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/jdbc/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/db/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/expression/Expression.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/expression/JavaExpressionParser.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/fileaccess/DTFileReader.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/fileaccess/FileAccess.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/fileaccess/FileAccessFSImpl.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/fileaccess/TFileImpl.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/fileaccess/TFileReader.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/fileaccess/TFileWriter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/fileaccess/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/filter/FilterOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/formatter/Formatter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/formatter/JsonFormatter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/formatter/XmlFormatter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/AbstractFTPInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/AbstractHttpGetMultiValuedMapOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/AbstractHttpGetOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/AbstractHttpInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/AbstractHttpOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/AbstractKeyValueStoreOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/AbstractSocketInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/ApacheGenRandomLogs.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/CollectionMultiConsoleOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/ConsoleOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/HttpGetMapOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/HttpJsonChunksInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/HttpLinesInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/HttpOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/HttpPostOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/IdempotentStorageManager.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/MapMultiConsoleOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/SmtpOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/WebSocketServerInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/WidgetOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/block/AbstractBlockReader.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/block/AbstractFSBlockReader.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/block/BlockMetadata.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/block/BlockWriter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/block/FSSliceReader.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/block/ReaderContext.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/block/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileSplitter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/AbstractReconciler.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/AbstractThroughputFileInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/FSInputModule.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/FileMerger.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/FileSplitter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterBase.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterInput.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/FileStitcher.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/FilterStreamCodec.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/FilterStreamContext.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/FilterStreamProvider.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/HDFSFileCopyModule.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/HDFSFileMerger.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/S3BlockReader.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/S3InputModule.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/Synchronizer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/TailFsInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/fs/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/AbstractJMSInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/AbstractJMSOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/AbstractJMSSinglePortOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/FSPsuedoTransactionableStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/JMSBase.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/JMSBaseTransactionableStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/JMSObjectInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/JMSStringInputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/JMSTransactionableStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/jms/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/io/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/AbstractJoinOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/AntiJoinOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/Bucket.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/InMemoryStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/JoinStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/MapJoinOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/POJOJoinOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/SemiJoinOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/TimeBasedStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/TimeEvent.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/join/TimeEventImpl.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/ApacheVirtualLogParseOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/DimensionAggregationUnifier.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/DimensionObject.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayList.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/InformationExtractor.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/LineToTokenArrayList.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/LineToTokenHashMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/LineTokenizer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/LineTokenizerKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregation.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/RegexMatchMapOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/logs/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/AbstractAggregateCalc.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/AbstractOutput.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/AbstractXmlCartesianProduct.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/AbstractXmlKeyValueCartesianProduct.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/Average.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/AverageKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/Division.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/LogicalCompare.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/LogicalCompareToConstant.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/Margin.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/MarginKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/MarginMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/Max.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/MaxKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/Min.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/MinKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/MultiplyByConstant.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/Range.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/RangeKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/RunningAverage.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/Sigma.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/SingleVariableAbstractCalculus.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/SquareCalculus.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/Sum.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/SumKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProduct.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/math/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/AvgAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/max/DoubleMaxAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/max/FloatMaxAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/max/IntMaxAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/max/LongMaxAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/min/DoubleMinAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/min/FloatMinAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/min/IntMinAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/min/LongMinAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/metric/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverage.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageObject.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/multiwindow/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/parser/Parser.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/parser/XmlParser.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/parser/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/partitioner/StatelessThroughputBasedPartitioner.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/partitioner/StatsAwareStatelessPartitioner.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/partitioner/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/projection/ProjectionOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/script/JavaScriptOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/script/ScriptOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/script/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/statistics/MedianOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/statistics/ModeOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/statistics/StandardDeviation.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/statistics/WeightedMeanOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/statistics/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/AbstractAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/ArrayListAggregator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/Counter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/DevNull.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/stream/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/testbench/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/transform/TransformOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKey.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKeyValueMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/AbstractBaseMatchOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/AbstractBaseNNonUniqueOperatorMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/AbstractBaseNOperatorMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/AbstractBaseNUniqueOperatorMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/AbstractBaseSortOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/AbstractDimensionTimeBucketOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/AbstractKeyValueStorageAgent.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/ActiveMQMessageListener.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/ActiveMQMultiTypeMessageListener.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/ArrayHashMapFrequent.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/BaseFilteredKeyValueOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/BaseKeyOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/BaseKeyValueOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/BaseNumberKeyValueOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/BaseUniqueKeyCounter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/BaseUniqueKeyValueCounter.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/FieldValueGenerator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/FilterOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/HighLow.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/JavaScriptFilterOperator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/KeyHashValPair.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/KeyValPair.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/KryoCloneUtils.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/PojoUtils.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/ReusableStringReader.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/ReversibleComparator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/StorageAgentKeyValueStore.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/TableInfo.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/TimeBucketKey.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/TopNSort.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/TopNUniqueSort.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierArrayHashMapFrequent.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierArrayList.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierBooleanAnd.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierBooleanOr.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierCountOccurKey.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierHashMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierHashMapFrequent.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierHashMapInteger.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierHashMapRange.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierHashMapSumKeys.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierKeyValRange.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierMap.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierRange.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/UnifierSumNumber.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/comparator/SliceComparator.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/package-info.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/util/time/WindowUtils.java
 delete mode 100644 library/src/main/java/com/datatorrent/lib/xml/AbstractXmlDOMOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/BottomNMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/BottomNUnifier.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/BottomNUniqueMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/CompareExceptCountMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/Distinct.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/FilterValues.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/InsertSort.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/LeastFrequentKeyArrayUnifier.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/LeastFrequentKeyUnifier.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/LeastFrequentValue.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/MatchAllMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/MatchAnyMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/MatchMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/MergeSort.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/MergeSortNumber.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/MostFrequentValue.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/TopN.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/TopNUnique.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/UniqueCounter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/UniqueValueCount.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/algo/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/QueueUtils.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/StoreUtils.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/datastructs/CacheLRUSynchronousFlush.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/datastructs/DimensionalTable.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/datastructs/NOPCacheFlushListener.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOByteArrayList.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOGetters.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOMutable.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOType.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOUtils.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/Serde.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeFieldsDescriptor.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListGPOMutable.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListPrimitive.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListString.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeMapPrimitive.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeObjectPayloadFix.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/AbstractWindowEndQueueManager.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/AppDataWindowEndQueueManager.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryBundle.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryExecutor.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerAsynchronous.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerSynchronous.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueueList.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueueManager.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/SimpleDoneQueueManager.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/SimpleQueueManager.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/WindowBoundedService.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/WindowEndQueueManager.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/CustomMessageDeserializer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/CustomMessageSerializer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/CustomMessageValidator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/DataQuerySnapshotValidator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/DataResultSnapshotSerializer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageDeserializerFactory.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageDeserializerInfo.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageSerializerFactory.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageSerializerInfo.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageType.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageValidatorInfo.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SchemaQueryDeserializer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataDeserializer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataSerializer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataValidator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/CustomTimeBucket.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DataQuerySnapshot.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DataResultSnapshot.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalConfigurationSchema.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalSchema.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Fields.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/FieldsDescriptor.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/JSONType.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Message.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/QRBase.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Query.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Result.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/ResultFormatter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Schema.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaQuery.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistry.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistryMultiple.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistrySingle.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaResult.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaResultSerializer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaUtils.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SnapshotSchema.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/TimeBucket.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Type.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/bandwidth/BandwidthLimitingOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/bandwidth/BandwidthManager.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/bandwidth/BandwidthPartitioner.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/codec/JavaSerializationStreamCodec.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/codec/KryoJdkContainer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/codec/KryoSerializableStreamCodec.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/codec/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/converter/ByteArrayToStringConverterOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/converter/Converter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/converter/MapToKeyHashValuePairConverter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/converter/MapToKeyValuePairConverter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/converter/StringValueToNumberConverterForMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/converter/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/counters/BasicCounters.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/counters/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/AbstractBatchTransactionableStoreOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/AbstractKeyValueStoreInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/AbstractStoreInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/AbstractStoreOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/AbstractTransactionableStoreOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/Connectable.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/KeyValueStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/Transactionable.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/TransactionableKeyValueStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/TransactionableStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/cache/AbstractDBLookupCacheBackedOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/cache/CacheManager.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/cache/CacheStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/cache/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcNonTransactionableBatchOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcPollInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JDBCDimensionalOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JDBCLookupCacheBackedOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcFieldInfo.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJOInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJOPollInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPollInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcTransactionalStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/db/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/expression/Expression.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/expression/JavaExpressionParser.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/fileaccess/DTFileReader.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/fileaccess/FileAccess.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/fileaccess/FileAccessFSImpl.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/fileaccess/TFileImpl.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/fileaccess/TFileReader.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/fileaccess/TFileWriter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/fileaccess/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/filter/FilterOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/formatter/Formatter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/formatter/JsonFormatter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/formatter/XmlFormatter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/AbstractFTPInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpGetMultiValuedMapOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpGetOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/AbstractKeyValueStoreOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/AbstractSocketInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/ApacheGenRandomLogs.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/CollectionMultiConsoleOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/ConsoleOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/HttpGetMapOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/HttpJsonChunksInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/HttpLinesInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/HttpOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/HttpPostOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/IdempotentStorageManager.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/MapMultiConsoleOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataQuery.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataResult.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/SimpleSinglePortInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/SmtpOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/WebSocketInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/WebSocketOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/WebSocketServerInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/WidgetOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/block/AbstractBlockReader.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/block/AbstractFSBlockReader.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/block/BlockMetadata.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/block/BlockWriter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/block/FSSliceReader.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/block/ReaderContext.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/block/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractFileInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractFileOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractFileSplitter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractReconciler.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractSingleFileOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractThroughputFileInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractWindowFileOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/FSInputModule.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileMerger.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileSplitter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileSplitterBase.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileSplitterInput.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileStitcher.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/FilterStreamCodec.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/FilterStreamContext.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/FilterStreamProvider.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/HDFSFileCopyModule.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/HDFSFileMerger.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/S3BlockReader.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/S3InputModule.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/Synchronizer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/TailFsInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/fs/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/AbstractJMSInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/AbstractJMSOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/AbstractJMSSinglePortOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/FSPsuedoTransactionableStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSBase.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSBaseTransactionableStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSMultiPortOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSObjectInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSStringInputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSTransactionableStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/jms/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/io/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/AbstractJoinOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/AntiJoinOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/Bucket.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/InMemoryStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/JoinStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/MapJoinOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/POJOJoinOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/SemiJoinOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/TimeBasedStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/TimeEvent.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/join/TimeEventImpl.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/ApacheLogParseMapOutputOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/ApacheLogParseOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/ApacheVirtualLogParseOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/DimensionAggregationUnifier.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/DimensionObject.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenArrayList.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenHashMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/FilteredLineTokenizerKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/InformationExtractor.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/LineToTokenArrayList.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/LineToTokenHashMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/LineTokenizer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/LineTokenizerKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/MultiWindowDimensionAggregation.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/RegexMatchMapOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/logs/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/AbstractAggregateCalc.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/AbstractOutput.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/AbstractXmlCartesianProduct.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/AbstractXmlKeyValueCartesianProduct.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/Average.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/AverageKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/Division.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/LogicalCompare.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/LogicalCompareToConstant.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/Margin.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/MarginKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/MarginMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/Max.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/MaxKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/Min.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/MinKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/MultiplyByConstant.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/Range.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/RangeKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/RunningAverage.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/Sigma.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/SingleVariableAbstractCalculus.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/SquareCalculus.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/Sum.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/SumKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/XmlKeyValueStringCartesianProduct.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/math/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/AvgAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/max/DoubleMaxAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/max/FloatMaxAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/max/IntMaxAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/max/LongMaxAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/min/DoubleMinAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/min/FloatMinAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/min/IntMinAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/min/LongMinAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/metric/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/multiwindow/AbstractSlidingWindow.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/multiwindow/AbstractSlidingWindowKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowRangeKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowSumKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/multiwindow/SimpleMovingAverage.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/multiwindow/SimpleMovingAverageObject.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/multiwindow/SortedMovingWindow.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/multiwindow/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/parser/Parser.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/parser/XmlParser.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/parser/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/partitioner/StatelessThroughputBasedPartitioner.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/partitioner/StatsAwareStatelessPartitioner.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/partitioner/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/projection/ProjectionOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/script/JavaScriptOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/script/ScriptOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/script/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/statistics/MedianOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/statistics/ModeOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/statistics/StandardDeviation.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/statistics/WeightedMeanOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/statistics/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/AbstractAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/ArrayListAggregator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/ArrayListToItem.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/ConsolidatorKeyVal.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/Counter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/DevNull.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/DevNullCounter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/HashMapToKeyValPair.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/JsonByteArrayOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/KeyValPairToHashMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/RoundRobinHashMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/StreamDuplicater.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/StreamMerger.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/stream/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/streamquery/condition/Condition.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/streamquery/condition/JoinColumnEqualCondition.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/streamquery/index/ColumnIndex.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/streamquery/index/Index.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/ArrayListTestSink.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/CollectorTestSink.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/CompareFilterTuples.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/CountAndLastTupleTestSink.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/CountOccurance.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/CountTestSink.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/EventClassifier.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/EventClassifierNumberToHashDouble.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/EventGenerator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/EventIncrementer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/FilterClassifier.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/FilteredEventClassifier.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/HashTestSink.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/HttpStatusFilter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/KeyValSum.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/RandomEventGenerator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/RandomWordGenerator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/RedisSumOper.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/SeedEventClassifier.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/SeedEventGenerator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/SumTestSink.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/ThroughputCounter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/TopOccurrence.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/testbench/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/transform/TransformOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseFrequentKey.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseFrequentKeyValueMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseMatchOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseNNonUniqueOperatorMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseNOperatorMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseNUniqueOperatorMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseSortOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/AbstractDimensionTimeBucketOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/AbstractKeyValueStorageAgent.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/ActiveMQMessageListener.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/ActiveMQMultiTypeMessageListener.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/ArrayHashMapFrequent.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/BaseFilteredKeyValueOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/BaseKeyOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/BaseKeyValueOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/BaseLineTokenizer.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/BaseMatchOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/BaseNumberKeyValueOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/BaseNumberValueOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/BaseUniqueKeyCounter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/BaseUniqueKeyValueCounter.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/DimensionTimeBucketSumOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/FieldInfo.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/FieldValueGenerator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/FilterOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/HighLow.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/JavaScriptFilterOperator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/KeyHashValPair.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/KeyValPair.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/KryoCloneUtils.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/PojoUtils.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/ReusableStringReader.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/ReversibleComparator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/StorageAgentKeyValueStore.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/TableInfo.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/TimeBucketKey.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/TopNSort.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/TopNUniqueSort.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierArrayHashMapFrequent.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierArrayList.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierBooleanAnd.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierBooleanOr.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierCountOccurKey.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapFrequent.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapInteger.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapRange.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapSumKeys.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierKeyValRange.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierMap.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierRange.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/UnifierSumNumber.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/comparator/SliceComparator.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/package-info.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/util/time/WindowUtils.java
 create mode 100644 library/src/main/java/org/apache/apex/malhar/lib/xml/AbstractXmlDOMOperator.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/BottomNMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/BottomNUnifierTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/BottomNUniqueMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/CompareExceptCountMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/DistinctTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/FilterValuesTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/InsertSortTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/LeastFrequentKeyTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/MatchAllMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/MatchAnyMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/MergeSortNumberTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/MostFrequentKeyTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/TopNTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/TopNUniqueTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/UniqueCounterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/algo/UniqueValueCountTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/ThreadUtils.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlushTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/datastructs/DimensionalTableTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/dimensions/CustomTimeBucketRegistryTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/dimensions/DimensionsEventTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/gpo/GPOMutableTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/gpo/GPOUtilsTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutableTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitiveTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeListStringTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/MockQuery.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/MockResult.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/MockResultSerializer.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronousTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronousTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/QueueUtilsTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/SimpleDoneQueryQueueManagerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/SimpleQueryQueueManagerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/WEQueryQueueManagerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/WindowBoundedServiceTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactoryTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/CustomTimeBucketTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshotDeserializerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshotTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshotSerializerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/DimensionalConfigurationSchemaTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/DimensionalSchemaTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/ResultFormatterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaQueryTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultipleTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingleTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaTestUtils.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaUtilsTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/SnapshotSchemaTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/schemas/TimeBucketTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPojoTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerTagsSupportTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthManagerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthPartitionerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/codec/JavaSerializationStreamCodecTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/codec/KryoStreamCodecTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/converter/ByteArrayToStringConverterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/converter/MapToKeyValuePairConverterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/counters/BasicCountersTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/KeyValueStoreOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/TransactionableKeyValueStoreOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/cache/CacheManagerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/cache/CacheStoreTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOApp.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcInputOperatorApplicationTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalStoreTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorApplicationTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcStoreTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/filter/FilterAppTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/filter/FilterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/formatter/JsonFormatterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/formatter/XmlFormatterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/helper/SamplePubSubWebSocketServlet.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/helper/TestPortContext.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/ApacheRandomLogsTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/HttpGetMapOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/HttpMultiValuedMapGetOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/HttpPostOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/IdempotentStorageManagerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResultTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/SmtpOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/SocketInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/WebSocketServerInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/block/AbstractBlockReaderTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/block/FSLineReaderTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/block/FSSliceReaderTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/block/ReadAheadLineReaderTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/AbstractReconcilerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/AbstractThroughputFileInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/BlockWriterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/FSInputModuleAppTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/FSInputModuleTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/FastMergerDecisionMakerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/FileMergerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/FileStitcherTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/S3InputModuleAppTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/SynchronizerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/fs/TailFsInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/FSPsuedoTransactionableStoreTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/JMSObjectInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/JMSOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/JMSTestBase.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTestBase.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/SQSStringInputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/io/jms/SQSTestBase.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/join/AntiJoinOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/join/MapTimeBasedJoinOperator.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/join/POJOTimeBasedJoinOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/join/SemiJoinOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/ApacheLogParseOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayListTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/LineToTokenArrayListTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/LineToTokenHashMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/LineTokenizerKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/LineTokenizerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregationTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/RegexMatchMapOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/logs/TopNUniqueSiteStatsTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/AverageKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/AverageTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/CountOccuranceTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/DivisionTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/LogicalCompareTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/LogicalCompareToConstantTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/MarginKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/MarginMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/MarginTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/MaxKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/MaxTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/MinKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/MinTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/MultiplyByConstantTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/RangeKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/RangeTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/RunningAverageTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/SigmaTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/SquareCalculusTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/SumKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/SumTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProductTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/multiwindow/SlidingWindowTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/multiwindow/SortedMovingWindowTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/parser/XmlParserApplicationTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/parser/XmlParserTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/partitioner/StatelessPartitionerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/partitioner/StatelessThroughputBasedPartitionerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/projection/ActivateTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/projection/ProjectionTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/script/JavaScriptOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/statistics/MeridianOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/statistics/ModeOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/statistics/StandardDeviationOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/statistics/WeightedMeanOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/ArrayListAggregatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/ArrayListToItemTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/ConsolidatorKeyValTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/CounterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/DevNullCounterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/DevNullTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/HashMapToKeyValPairTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/JsonByteArrayOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/KeyPairToHashMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/RoundRobinHashMapTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/StreamDuplicaterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/stream/StreamMergerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/ActiveMQMessageGenerator.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/EventClassifierTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/EventGeneratorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/EventIncrementerTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/FilteredEventClassifierTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/RandomEventGeneratorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/RandomWordGeneratorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/SeedEventClassifierTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/SeedEventGeneratorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/testbench/ThroughputCounterTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/transform/TransformOperatorAppTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/transform/TransformOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/util/JavaScriptFilterOperatorTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/util/KryoCloneUtilsTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/util/PojoUtilsTest.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/util/TestObjAllTypes.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/util/TestUtils.java
 delete mode 100644 library/src/test/java/com/datatorrent/lib/util/time/WindowUtilsTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/BottomNMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/BottomNUnifierTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/BottomNUniqueMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/CompareExceptCountMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/DistinctTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/FilterValuesTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/InsertSortTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/LeastFrequentKeyTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/MatchAllMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/MatchAnyMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/MergeSortNumberTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/MostFrequentKeyTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/TopNTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/TopNUniqueTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/UniqueCounterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/algo/UniqueValueCountTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/ThreadUtils.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/datastructs/CacheLRUSynchronousFlushTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/datastructs/DimensionalTableTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/dimensions/CustomTimeBucketRegistryTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/dimensions/DimensionsEventTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/GPOMutableTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/GPOUtilsTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeFieldsDescriptorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListGPOMutableTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListPrimitiveTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListStringTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/MockQuery.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/MockResult.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/MockResultSerializer.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerAsynchronousTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerSynchronousTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/QueueUtilsTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/SimpleDoneQueryQueueManagerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/SimpleQueryQueueManagerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/WEQueryQueueManagerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/WindowBoundedServiceTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageDeserializerFactoryTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataValidatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/CustomTimeBucketTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DataQuerySnapshotDeserializerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DataQuerySnapshotTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DataResultSnapshotSerializerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalConfigurationSchemaTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalSchemaTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/FieldsDescriptorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/ResultFormatterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaQueryTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistryMultipleTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistrySingleTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaTestUtils.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaUtilsTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SnapshotSchemaTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/TimeBucketTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerPojoTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerTagsSupportTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/bandwidth/BandwidthManagerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/bandwidth/BandwidthPartitionerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/codec/JavaSerializationStreamCodecTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/codec/KryoStreamCodecTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/converter/ByteArrayToStringConverterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/converter/MapToKeyValuePairConverterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/converter/StringValueToNumberConverterForMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/counters/BasicCountersTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/KeyValueStoreOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/TransactionableKeyValueStoreOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/cache/CacheManagerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/cache/CacheStoreTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcIOApp.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcIOAppTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcInputOperatorApplicationTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalStoreTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPojoOperatorApplicationTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPojoOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcStoreTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/filter/FilterAppTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/filter/FilterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/formatter/JsonFormatterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/formatter/XmlFormatterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/helper/OperatorContextTestHelper.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/helper/SamplePubSubWebSocketServlet.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/helper/TestPortContext.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/ApacheRandomLogsTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/FTPStringInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/HttpGetMapOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/HttpJsonChunksInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/HttpLinesInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/HttpMultiValuedMapGetOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/HttpPostOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/IdempotentStorageManagerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataQueryTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataResultTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/SmtpOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/SocketInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/WebSocketServerInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/block/AbstractBlockReaderTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/block/FSLineReaderTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/block/FSSliceReaderTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/block/ReadAheadLineReaderTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractFileInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractFileOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractReconcilerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractSingleFileOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractThroughputFileInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractWindowFileOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/BlockWriterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/FSInputModuleAppTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/FSInputModuleTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/FastMergerDecisionMakerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileMergerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileSplitterBaseTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileSplitterInputTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileSplitterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileStitcherTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/S3InputModuleAppTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/SynchronizerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/fs/TailFsInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/FSPsuedoTransactionableStoreTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSMultiPortOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSObjectInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSStringInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSTestBase.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSTransactionableStoreTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSTransactionableStoreTestBase.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/SQSStringInputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/io/jms/SQSTestBase.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/join/AntiJoinOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/join/MapTimeBasedJoinOperator.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/join/POJOTimeBasedJoinOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/join/SemiJoinOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/ApacheLogParseMapOutputOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/ApacheLogParseOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenArrayListTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenHashMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/FilteredLineTokenizerKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/LineToTokenArrayListTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/LineToTokenHashMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/LineTokenizerKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/LineTokenizerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/MultiWindowDimensionAggregationTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/RegexMatchMapOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/logs/TopNUniqueSiteStatsTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/AverageKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/AverageTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/CountOccuranceTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/DivisionTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/LogicalCompareTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/LogicalCompareToConstantTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/MarginKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/MarginMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/MarginTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/MaxKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/MaxTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/MinKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/MinTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/MultiplyByConstantTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/RangeKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/RangeTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/RunningAverageTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/SigmaTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/SquareCalculusTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/SumKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/SumTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/math/XmlKeyValueStringCartesianProductTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowRangeKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowSumKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/multiwindow/SimpleMovingAverageTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/multiwindow/SlidingWindowTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/multiwindow/SortedMovingWindowTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/parser/XmlParserApplicationTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/parser/XmlParserTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/partitioner/StatelessPartitionerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/partitioner/StatelessThroughputBasedPartitionerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/projection/ActivateTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/projection/ProjectionTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/script/JavaScriptOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/statistics/MeridianOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/statistics/ModeOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/statistics/StandardDeviationOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/statistics/WeightedMeanOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/ArrayListAggregatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/ArrayListToItemTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/ConsolidatorKeyValTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/CounterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/DevNullCounterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/DevNullTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/HashMapToKeyValPairTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/JsonByteArrayOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/KeyPairToHashMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/RoundRobinHashMapTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/StreamDuplicaterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/stream/StreamMergerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/ActiveMQMessageGenerator.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/EventClassifierTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/EventGeneratorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/EventIncrementerTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/FilteredEventClassifierTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/RandomEventGeneratorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/RandomWordGeneratorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/SeedEventClassifierTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/SeedEventGeneratorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/testbench/ThroughputCounterTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/transform/TransformOperatorAppTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/transform/TransformOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/util/DimensionTimeBucketSumOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/util/JavaScriptFilterOperatorTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/util/KryoCloneUtilsTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/util/PojoUtilsTest.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/util/TestObjAllTypes.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/util/TestUtils.java
 create mode 100644 library/src/test/java/org/apache/apex/malhar/lib/util/time/WindowUtilsTest.java
 delete mode 100644 samples/pom.xml
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/algo/AllAfterMatchMapSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/algo/BottomNMapSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/algo/package-info.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/io/HttpInputOperatorSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/io/package-info.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/AverageKeyValSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/AverageSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/ChangeSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/CompreMapSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/CountKeyValSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/CountKeyValues.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/LogicalCompareSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/PartitionMathSumSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/RandomEvenetGeneratorSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/RandomKeyValMap.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/RandomKeyValues.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/RandomPairIntegers.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/ScriptSample.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/SingleKeyValMap.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/lib/math/package-info.java
 delete mode 100644 samples/src/main/java/com/datatorrent/samples/package-info.java
 delete mode 100644 samples/src/test/java/com/datatorrent/samples/lib/math/PartitionMathSumSampleTest.java
 delete mode 100644 samples/src/test/resources/log4j.properties

-- 
To stop receiving notification emails like this one, please contact
['"commits@apex.apache.org" <co...@apex.apache.org>'].

[apex-malhar] 02/02: APEXMALHAR-2517 imports/checkstyle #662

Posted by vr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vrozov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apex-malhar.git

commit 0d98d05ef670dcf8359681b384de1d78734f6657
Author: Apex Dev <de...@apex.apache.org>
AuthorDate: Mon Aug 14 06:53:10 2017 -0700

    APEXMALHAR-2517 imports/checkstyle #662
---
 apps/filecopy/pom.xml                              |   4 +-
 .../com/datatorrent/apps/copy/HDFSFileCopyApp.java |   4 +-
 apps/logstream/pom.xml                             |   2 +-
 .../logstream/AggregationsToRedisOperator.java     |   4 +-
 .../datatorrent/apps/logstream/Application.java    |  29 +--
 .../datatorrent/apps/logstream/Application1.java   |   5 +-
 .../apps/logstream/DimensionOperator.java          |   5 +-
 .../apps/logstream/DimensionOperatorUnifier.java   |   3 +-
 .../apps/logstream/LogScoreOperator.java           |   4 +-
 .../datatorrent/apps/logstream/LogstreamTopN.java  |   6 +-
 .../logstream/LogstreamWidgetOutputOperator.java   |   5 +-
 .../apps/logstream/RabbitMQLogsInputOperator.java  |   3 +-
 .../apps/logstream/DimensionOperatorTest.java      |   5 +-
 .../logstream/DimensionOperatorUnifierTest.java    |   5 +-
 .../apps/logstream/FilterOperatorTest.java         |   2 +-
 .../apps/logstream/LogstreamTopNTest.java          |   5 +-
 apps/pom.xml                                       |   2 +-
 benchmark/pom.xml                                  |   2 +-
 .../apache/apex/benchmark/ApplicationFixed.java    |   2 +-
 .../java/org/apache/apex/benchmark/Benchmark.java  |   2 +-
 .../apache/apex/benchmark/CouchBaseAppInput.java   |   2 +-
 .../apache/apex/benchmark/CouchBaseAppOutput.java  |   4 +-
 .../apex/benchmark/CouchBaseInputOperator.java     |   6 +-
 .../apex/benchmark/CouchBaseOutputOperator.java    |   4 +-
 .../apex/benchmark/FixedTuplesInputOperator.java   |   2 +-
 .../org/apache/apex/benchmark/RandomMapOutput.java |   2 +-
 .../apex/benchmark/RandomWordInputModule.java      |   2 +-
 .../apache/apex/benchmark/WordCountOperator.java   |   2 +-
 .../AerospikeOutputBenchmarkApplication.java       |   6 +-
 .../aerospike/AerospikeOutputOperator.java         |   6 +-
 .../algo/UniqueValueCountBenchmarkApplication.java |  14 +-
 .../CassandraOutputBenchmarkApplication.java       |   8 +-
 .../cassandra/CassandraOutputOperator.java         |   6 +-
 .../apex/benchmark/fs/FSByteOutputOperator.java    |   4 +-
 .../benchmark/fs/FSOutputOperatorBenchmark.java    |   8 +-
 .../benchmark/hive/HiveInsertBenchmarkingApp.java  |   8 +-
 .../hive/HiveMapInsertBenchmarkingApp.java         |  13 +-
 .../kafka/BenchmarkKafkaInputOperator.java         |   5 +-
 .../BenchmarkPartitionableKafkaOutputOperator.java |   2 +-
 .../apex/benchmark/kafka/KafkaInputBenchmark.java  |   9 +-
 .../apex/benchmark/kafka/KafkaOutputBenchmark.java |   2 +-
 .../apex/benchmark/kafka/KafkaTestPartitioner.java |   2 +-
 .../org/apache/apex/benchmark/package-info.java    |   2 +-
 .../script/RubyOperatorBenchmarkApplication.java   |  12 +-
 .../benchmark/spillable/SpillableBenchmarkApp.java |   4 +-
 .../spillable/SpillableTestInputOperator.java      |   2 +-
 .../benchmark/spillable/SpillableTestOperator.java |   2 +-
 .../benchmark/state/ManagedStateBenchmarkApp.java  |   6 +-
 .../apache/apex/benchmark/state/StoreOperator.java |   4 +-
 .../benchmark/stream/DevNullCounterBenchmark.java  |   6 +-
 .../apex/benchmark/stream/IntegerOperator.java     |   2 +-
 .../apex/benchmark/stream/StreamDuplicaterApp.java |   6 +-
 .../apex/benchmark/stream/StreamMergeApp.java      |   6 +-
 .../benchmark/testbench/EventClassifierApp.java    |   6 +-
 .../EventClassifierNumberToHashDoubleApp.java      |   8 +-
 .../benchmark/testbench/EventGeneratorApp.java     |   6 +-
 .../benchmark/testbench/EventIncrementerApp.java   |   6 +-
 .../benchmark/testbench/FilterClassifierApp.java   |   6 +-
 .../testbench/FilteredEventClassifierApp.java      |   6 +-
 .../apex/benchmark/testbench/HashMapOperator.java  |   5 +-
 .../testbench/RandomEventGeneratorApp.java         |   6 +-
 .../benchmark/testbench/SeedEventGeneratorApp.java |   9 +-
 .../benchmark/testbench/ThroughputCounterApp.java  |   6 +-
 .../apex/benchmark/window/AbstractGenerator.java   |   2 +-
 .../AbstractWindowedOperatorBenchmarkApp.java      |   8 +-
 .../window/KeyedWindowedOperatorBenchmarkApp.java  |   6 +-
 .../window/WindowedOperatorBenchmarkApp.java       |   2 +-
 .../apex/benchmark/ApplicationFixedTest.java       |   2 +-
 .../org/apache/apex/benchmark/BenchmarkTest.java   |   2 +-
 .../apex/benchmark/CouchBaseBenchmarkTest.java     |   2 +-
 .../apex/benchmark/accumulo/AccumuloApp.java       |  10 +-
 .../apex/benchmark/accumulo/AccumuloAppTest.java   |   2 +-
 .../aerospike/AerospikeBenchmarkAppTest.java       |   2 +-
 .../algo/UniqueValueCountBenchmarkTest.java        |   2 +-
 .../cassandra/CassandraApplicatonTest.java         |   2 +-
 .../apex/benchmark/hbase/HBaseApplicationTest.java |   2 +-
 .../hbase/HBaseCsvMappingApplication.java          |   6 +-
 .../benchmark/hive/HiveInsertBenchmarkTest.java    |   2 +-
 .../apex/benchmark/hive/HiveMapBenchmarkTest.java  |   2 +-
 .../benchmark/kafka/KafkaInputBenchmarkTest.java   |   2 +-
 .../benchmark/kafka/KafkaOutputBenchmarkTest.java  |   2 +-
 .../benchmark/memsql/MemsqlInputBenchmark.java     |   6 +-
 .../benchmark/memsql/MemsqlInputBenchmarkTest.java |  16 +-
 .../benchmark/memsql/MemsqlOutputBenchmark.java    |   6 +-
 .../memsql/MemsqlOutputBenchmarkTest.java          |   6 +-
 .../script/RubyOperatorBenchmarkAppTest.java       |   2 +-
 .../spillable/SpillableBenchmarkAppTester.java     |   2 +-
 .../spillable/SpillableDSBenchmarkTest.java        |   5 +-
 .../state/ManagedStateBenchmarkAppTest.java        |   4 +-
 .../testbench/EventClassifierAppTest.java          |   2 +-
 .../EventClassifierNumberToHashDoubleAppTest.java  |   2 +-
 .../benchmark/testbench/EventGeneratorAppTest.java |   2 +-
 .../testbench/EventIncrementerAppTest.java         |   2 +-
 .../testbench/FilterClassifierAppTest.java         |   2 +-
 .../testbench/FilteredEventClassifierAppTest.java  |   2 +-
 .../testbench/ThroughputCounterAppTest.java        |   2 +-
 .../util/serde/GenericSerdePerformanceTest.java    |   2 +-
 .../KeyedWindowedOperatorBenchmarkAppTest.java     |   2 +-
 .../window/WindowedOperatorBenchmarkAppTest.java   |   2 +-
 contrib/pom.xml                                    |  11 +-
 .../accumulo/AbstractAccumuloInputOperator.java    |  13 +-
 .../accumulo/AbstractAccumuloOutputOperator.java   |  26 +-
 .../malhar/contrib/accumulo/AccumuloStore.java     |  70 ++++--
 .../contrib/accumulo/AccumuloWindowStore.java      |  71 +++---
 .../apex/malhar/contrib/accumulo/package-info.java |   2 +-
 .../aerospike/AbstractAerospikeGetOperator.java    |  32 +--
 ...stractAerospikeNonTransactionalPutOperator.java |  30 +--
 .../AbstractAerospikeTransactionalPutOperator.java |  33 +--
 .../AerospikePOJONonTransactionalPutOperator.java  |  20 +-
 .../AerospikePOJOTransactionalPutOperator.java     |  24 +-
 .../malhar/contrib/aerospike/AerospikeStore.java   |  48 ++--
 .../aerospike/AerospikeTransactionalStore.java     |  87 ++++---
 .../malhar/contrib/aerospike/package-info.java     |   2 +-
 .../contrib/apachelog/ApacheLogInputGenerator.java |  44 ++--
 .../contrib/apachelog/ApplicationLocalLog.java     |  11 +-
 .../contrib/apachelog/ApplicationLogGenerator.java |  14 +-
 .../malhar/contrib/apachelog/GeoIPExtractor.java   |  18 +-
 .../contrib/apachelog/TimestampExtractor.java      |  11 +-
 .../contrib/apachelog/UserAgentExtractor.java      |  10 +-
 .../malhar/contrib/apachelog/package-info.java     |   2 +-
 .../malhar/contrib/apachelog/zmq/Application.java  |  16 +-
 .../malhar/contrib/avro/AvroFileInputOperator.java |   4 +-
 .../malhar}/contrib/avro/AvroFileToPojoModule.java |   2 +-
 .../apex/malhar/contrib/avro/AvroRecordHelper.java |   2 +-
 .../apex/malhar/contrib/avro/AvroToPojo.java       |  10 +-
 .../apex/malhar/contrib/avro/PojoToAvro.java       |   9 +-
 .../cassandra/AbstractCassandraInputOperator.java  |  14 +-
 ...ractCassandraTransactionableOutputOperator.java |   8 +-
 .../cassandra/AbstractUpsertOutputOperator.java    |   4 +-
 .../cassandra/CassandraPOJOInputOperator.java      |  25 +-
 .../cassandra/CassandraPOJOOutputOperator.java     |  47 ++--
 .../contrib/cassandra/CassandraPojoUtils.java      |   5 +-
 .../CassandraPreparedStatementGenerator.java       |   2 +-
 .../malhar/contrib/cassandra/CassandraStore.java   |  39 +--
 .../cassandra/CassandraTransactionalStore.java     |  45 ++--
 .../contrib/cassandra/ConnectionStateManager.java  |   4 +-
 .../contrib/cassandra/UpsertExecutionContext.java  |   4 +-
 .../malhar/contrib/cassandra/package-info.java     |   2 +-
 .../couchbase/AbstractCouchBaseInputOperator.java  |  34 ++-
 .../couchbase/AbstractCouchBaseOutputOperator.java |  29 ++-
 .../couchbase/AbstractCouchBaseSetOperator.java    |   2 +-
 .../contrib/couchbase/CouchBaseJSONSerializer.java |   7 +-
 .../couchbase/CouchBasePOJOInputOperator.java      |  20 +-
 .../contrib/couchbase/CouchBaseSerializer.java     |   2 +-
 .../malhar/contrib/couchbase/CouchBaseStore.java   |  34 ++-
 .../contrib/couchbase/CouchBaseWindowStore.java    |  33 ++-
 .../couchbase/CouchbasePOJOSetOperator.java        |   8 +-
 .../malhar/contrib/couchbase/package-info.java     |   2 +-
 .../couchdb/AbstractCouchDBInputOperator.java      |  10 +-
 .../couchdb/AbstractCouchDBOutputOperator.java     |   5 +-
 .../couchdb/AbstractMapBasedInputOperator.java     |   8 +-
 .../contrib/couchdb/CouchDBPOJOInputOperator.java  |  45 ++--
 .../contrib/couchdb/CouchDBPOJOOutputOperator.java |   7 +-
 .../apex/malhar/contrib/couchdb/CouchDbStore.java  |  10 +-
 .../couchdb/MapBasedCouchDbOutputOperator.java     |   4 +-
 .../apex/malhar/contrib/couchdb/package-info.java  |   2 +-
 .../AbstractElasticSearchInputOperator.java        |   7 +-
 .../AbstractElasticSearchOutputOperator.java       |  30 +--
 .../elasticsearch/ElasticSearchConnectable.java    |  10 +-
 .../ElasticSearchMapInputOperator.java             |   8 +-
 .../ElasticSearchMapOutputOperator.java            |  10 +-
 .../ElasticSearchPercolatorOperator.java           |  10 +-
 .../ElasticSearchPercolatorStore.java              |   5 +-
 .../malhar/contrib/elasticsearch/package-info.java |   2 +-
 .../malhar/contrib/enrich/AbstractEnricher.java    |  12 +-
 .../apex/malhar/contrib/enrich/BackendLoader.java  |   7 +-
 .../malhar/contrib/enrich/DelimitedFSLoader.java   |  11 +-
 .../apex/malhar/contrib/enrich/FSLoader.java       |   6 +-
 .../malhar/contrib/enrich/FixedWidthFSLoader.java  |   7 +-
 .../apex/malhar/contrib/enrich/JDBCLoader.java     |   6 +-
 .../apex/malhar/contrib/enrich/JsonFSLoader.java   |   2 +-
 .../apex/malhar/contrib/enrich/MapEnricher.java    |   6 +-
 .../contrib/enrich/NullValuesCacheManager.java     |   5 +-
 .../apex/malhar/contrib/enrich/POJOEnricher.java   |  13 +-
 .../apex/malhar/contrib/enrich/ReadOnlyBackup.java |   5 +-
 .../malhar/contrib/formatter/CsvFormatter.java     |  11 +-
 .../contrib/geode/AbstractGeodeInputOperator.java  |   4 +-
 .../contrib/geode/AbstractGeodeOutputOperator.java |   4 +-
 .../malhar/contrib/geode/GeodeCheckpointStore.java |  27 ++-
 .../contrib/geode/GeodeKeyValueStorageAgent.java   |   5 +-
 .../contrib/geode/GeodePOJOOutputOperator.java     |  11 +-
 .../apex/malhar/contrib/geode/GeodeStore.java      |  10 +-
 .../malhar/contrib/geode/RegionCreateFunction.java |   2 +-
 .../hbase/AbstractHBaseAppendOutputOperator.java   |  13 +-
 .../contrib/hbase/AbstractHBaseOutputOperator.java |  14 +-
 .../hbase/AbstractHBasePutOutputOperator.java      |   8 +-
 .../AbstractHBaseWindowAppendOutputOperator.java   |  28 ++-
 .../hbase/AbstractHBaseWindowOutputOperator.java   |   6 +-
 .../AbstractHBaseWindowPutOutputOperator.java      |  31 +--
 .../contrib/hbase/HBaseCsvMappingPutOperator.java  |  44 ++--
 .../apex/malhar/contrib/hbase/HBaseFieldInfo.java  | 133 +++++-----
 .../contrib/hbase/HBaseFieldValueGenerator.java    |   6 +-
 .../malhar/contrib/hbase/HBaseGetOperator.java     |   2 +-
 .../malhar/contrib/hbase/HBaseInputOperator.java   |   5 +-
 .../hbase/HBaseNameValueCsvPutOperator.java        |  71 +++---
 .../malhar/contrib/hbase/HBaseOperatorBase.java    |  11 +-
 .../contrib/hbase/HBasePOJOInputOperator.java      |  28 +--
 .../malhar/contrib/hbase/HBasePOJOPutOperator.java |  13 +-
 .../malhar/contrib/hbase/HBaseScanOperator.java    |  32 +--
 .../apex/malhar/contrib/hbase/HBaseStore.java      |  80 +++---
 .../malhar/contrib/hbase/HBaseWindowStore.java     |  55 +++--
 .../apex/malhar}/contrib/hbase/OutputAdapter.java  |   4 +-
 .../apex/malhar/contrib/hbase/package-info.java    |   2 +-
 .../apex/malhar/contrib/jython/PythonOperator.java |  18 +-
 .../apex/malhar/contrib/jython/package-info.java   |   2 +-
 .../AbstractExactlyOnceKafkaOutputOperator.java    |  36 ++-
 .../contrib/kafka/AbstractKafkaInputOperator.java  | 269 ++++++++++-----------
 .../contrib/kafka/AbstractKafkaOutputOperator.java |  18 +-
 .../AbstractKafkaSinglePortInputOperator.java      |   2 +-
 .../contrib/kafka/HighlevelKafkaConsumer.java      |   8 +-
 .../apex/malhar/contrib/kafka/KafkaConsumer.java   | 116 ++++-----
 .../malhar/contrib/kafka/KafkaJsonEncoder.java     |   2 +-
 .../malhar/contrib/kafka/KafkaMetadataUtil.java    |  22 +-
 .../apex/malhar/contrib/kafka/KafkaPartition.java  |  32 ++-
 .../KafkaSinglePortByteArrayInputOperator.java     |  32 ++-
 .../kafka/KafkaSinglePortOutputOperator.java       |   2 +-
 .../kafka/KafkaSinglePortStringInputOperator.java  |   8 +-
 .../apex/malhar/contrib/kafka/OffsetManager.java   |   2 +-
 .../contrib/kafka/POJOKafkaOutputOperator.java     |   8 +-
 .../malhar/contrib/kafka/SimpleKafkaConsumer.java  | 114 ++++-----
 .../apex/malhar/contrib/kafka/package-info.java    |   2 +-
 .../kinesis/AbstractKinesisInputOperator.java      | 194 +++++++--------
 .../kinesis/AbstractKinesisOutputOperator.java     |  43 ++--
 .../kinesis/KinesisByteArrayInputOperator.java     |   5 +-
 .../kinesis/KinesisByteArrayOutputOperator.java    |   2 +-
 .../malhar/contrib/kinesis/KinesisConsumer.java    |  62 +++--
 .../kinesis/KinesisStringInputOperator.java        |   8 +-
 .../kinesis/KinesisStringOutputOperator.java       |   3 +-
 .../apex/malhar/contrib/kinesis/KinesisUtil.java   |  41 ++--
 .../apex/malhar/contrib/kinesis/ShardManager.java  |   2 +-
 .../apex/malhar/contrib/kinesis/package-info.java  |   2 +-
 .../memcache/AbstractMemcacheInputOperator.java    |   4 +-
 .../memcache/AbstractMemcacheOutputOperator.java   |   7 +-
 .../memcache/MemcachePOJOOutputOperator.java       |  18 +-
 .../malhar/contrib/memcache/MemcacheStore.java     |  16 +-
 .../apex/malhar/contrib/memcache/package-info.java |   2 +-
 .../AbstractMemcacheInputOperator.java             |   4 +-
 .../AbstractMemcacheOutputOperator.java            |   7 +-
 .../contrib/memcache_whalin/MemcacheStore.java     |  14 +-
 .../contrib/memcache_whalin/package-info.java      |   2 +-
 .../memsql/AbstractMemsqlInputOperator.java        |   4 +-
 .../memsql/AbstractMemsqlOutputOperator.java       |   4 +-
 .../contrib/memsql/MemsqlPOJOInputOperator.java    |  98 +++-----
 .../contrib/memsql/MemsqlPOJOOutputOperator.java   |  57 ++---
 .../apex/malhar/contrib/memsql/MemsqlStore.java    |   4 +-
 .../apex/malhar/contrib/memsql/package-info.java   |   2 +-
 .../misc/algo/AbstractStreamPatternMatcher.java    |   4 +-
 .../malhar/contrib/misc/algo/AllAfterMatchMap.java |   4 +-
 .../apex/malhar/contrib/misc/algo/DistinctMap.java |   6 +-
 .../malhar/contrib/misc/algo/FilterKeyVals.java    |   4 +-
 .../contrib/misc/algo/FilterKeysHashMap.java       |   4 +-
 .../malhar/contrib/misc/algo/FilterKeysMap.java    |   6 +-
 .../malhar/contrib/misc/algo/FirstMatchMap.java    |   4 +-
 .../apex/malhar/contrib/misc/algo/FirstN.java      |   3 +-
 .../malhar/contrib/misc/algo/FirstTillMatch.java   |   4 +-
 .../malhar/contrib/misc/algo/InsertSortDesc.java   |   5 +-
 .../apex/malhar/contrib/misc/algo/InvertIndex.java |   4 +-
 .../malhar/contrib/misc/algo/InvertIndexArray.java |   4 +-
 .../malhar/contrib/misc/algo/LastMatchMap.java     |   4 +-
 .../contrib/misc/algo/LeastFrequentKeyMap.java     |   8 +-
 .../misc/algo/LeastFrequentKeyValueMap.java        |   4 +-
 .../contrib/misc/algo/MostFrequentKeyMap.java      |   8 +-
 .../contrib/misc/algo/MostFrequentKeyValueMap.java |   4 +-
 .../apex/malhar/contrib/misc/algo/Sampler.java     |   4 +-
 .../{aerospike => misc/algo}/package-info.java     |   2 +-
 .../apex/malhar/contrib/misc/math/Change.java      |   3 +-
 .../apex/malhar/contrib/misc/math/ChangeAlert.java |   5 +-
 .../contrib/misc/math/ChangeAlertKeyVal.java       |   4 +-
 .../malhar/contrib/misc/math/ChangeAlertMap.java   |   2 +-
 .../malhar/contrib/misc/math/ChangeKeyVal.java     |   5 +-
 .../malhar/contrib/misc/math/CompareExceptMap.java |   5 +-
 .../apex/malhar/contrib/misc/math/CompareMap.java  |   3 +-
 .../apex/malhar/contrib/misc/math/CountKeyVal.java |   6 +-
 .../apex/malhar/contrib/misc/math/ExceptMap.java   |   5 +-
 .../apex/malhar/contrib/misc/math/Quotient.java    |   3 +-
 .../apex/malhar/contrib/misc/math/QuotientMap.java |   2 +-
 .../apex/malhar/contrib/misc/math/SumCountMap.java |   6 +-
 .../{aerospike => misc/math}/package-info.java     |   2 +-
 .../contrib/misc/streamquery/DeleteOperator.java   |   3 +-
 .../misc/streamquery/GroupByHavingOperator.java    |   7 +-
 .../misc/streamquery/InnerJoinOperator.java        |   5 +-
 .../contrib/misc/streamquery/SelectOperator.java   |   5 +-
 .../contrib/misc/streamquery/UpdateOperator.java   |   3 +-
 .../streamquery/condition/BetweenCondition.java    |   2 +-
 .../streamquery/condition/CompoundCondition.java   |   2 +-
 .../streamquery/condition/EqualValueCondition.java |   2 +-
 .../misc/streamquery/condition/InCondition.java    |   2 +-
 .../misc/streamquery/condition/LikeCondition.java  |   2 +-
 .../misc/streamquery/index/BinaryExpression.java   |   2 +-
 .../contrib/misc/streamquery/index/MidIndex.java   |   2 +-
 .../misc/streamquery/index/NegateExpression.java   |   2 +-
 .../misc/streamquery/index/RoundDoubleIndex.java   |   2 +-
 .../misc/streamquery/index/StringCaseIndex.java    |   2 +-
 .../misc/streamquery/index/StringLenIndex.java     |   2 +-
 .../misc/streamquery/index/SumExpression.java      |   2 +-
 .../misc/streamquery/index/UnaryExpression.java    |   2 +-
 .../mongodb/MongoDBArrayListOutputOperator.java    |   7 +-
 .../malhar/contrib/mongodb/MongoDBConnectable.java |  13 +-
 .../mongodb/MongoDBHashMapOutputOperator.java      |   9 +-
 .../contrib/mongodb/MongoDBInputOperator.java      |  21 +-
 .../contrib/mongodb/MongoDBOutputOperator.java     |  56 ++---
 .../contrib/mongodb/MongoDBPOJOOutputOperator.java |  27 +--
 .../apex/malhar/contrib/mongodb/package-info.java  |   2 +-
 .../contrib/mqtt/AbstractMqttInputOperator.java    |  30 +--
 .../contrib/mqtt/AbstractMqttOutputOperator.java   |  13 +-
 .../mqtt/AbstractSinglePortMqttInputOperator.java  |   6 +-
 .../mqtt/AbstractSinglePortMqttOutputOperator.java |   2 +-
 .../apex/malhar/contrib/mqtt/MqttClientConfig.java |   4 +-
 .../apex/malhar/contrib/mqtt/package-info.java     |   2 +-
 .../contrib/nifi/AbstractNiFiInputOperator.java    |   5 +-
 .../contrib/nifi/AbstractNiFiOutputOperator.java   |   2 +-
 .../nifi/AbstractNiFiSinglePortInputOperator.java  |   2 +-
 .../apex/malhar/contrib/nifi/NiFiDataPacket.java   |   2 +-
 .../malhar/contrib/nifi/NiFiDataPacketBuilder.java |   2 +-
 .../contrib/nifi/NiFiSinglePortInputOperator.java  |   2 +-
 .../contrib/nifi/NiFiSinglePortOutputOperator.java |   2 +-
 .../contrib/nifi/StandardNiFiDataPacket.java       |   2 +-
 .../contrib/parquet/AbstractParquetFileReader.java |   6 +-
 .../contrib/parquet/ParquetFilePOJOReader.java     |   6 +-
 .../malhar/contrib/parser/AbstractCsvParser.java   |  66 +++--
 .../contrib/parser/CellProcessorBuilder.java       |   5 +-
 .../malhar/contrib/parser/CommonLogParser.java     |  48 ++--
 .../apex/malhar/contrib/parser/CsvParser.java      |  10 +-
 .../malhar/contrib/parser/DelimitedSchema.java     |   2 +-
 .../malhar/contrib/parser/FixedWidthParser.java    |  20 +-
 .../malhar/contrib/parser/FixedWidthSchema.java    |  17 +-
 .../apex/malhar/contrib/parser/JsonParser.java     |   6 +-
 .../apex/malhar/contrib/parser/LogParser.java      |  11 +-
 .../malhar/contrib/parser/LogSchemaDetails.java    |  18 +-
 .../apex/malhar/contrib/parser/RegexParser.java    |  10 +-
 .../apache/apex/malhar/contrib/parser/Schema.java  |   2 +-
 .../malhar/contrib/parser/StreamingJsonParser.java |  10 +-
 .../apex/malhar/contrib/parser/package-info.java   |   2 +-
 .../apex/malhar/contrib/r/REngineConnectable.java  |  12 +-
 .../org/apache/apex/malhar/contrib/r/RMax.java     |  14 +-
 .../org/apache/apex/malhar/contrib/r/RMin.java     |  14 +-
 .../org/apache/apex/malhar/contrib/r/RScript.java  |  87 +++----
 .../apex/malhar/contrib/r/RStandardDeviation.java  |  12 +-
 .../apache/apex/malhar/contrib/r/package-info.java |   2 +-
 .../rabbitmq/AbstractRabbitMQInputOperator.java    |  62 ++---
 .../rabbitmq/AbstractRabbitMQOutputOperator.java   |  48 ++--
 .../AbstractSinglePortRabbitMQInputOperator.java   |  15 +-
 .../AbstractSinglePortRabbitMQOutputOperator.java  |   5 +-
 .../contrib/rabbitmq/RabbitMQInputOperator.java    |   2 +-
 .../contrib/rabbitmq/RabbitMQOutputOperator.java   |   2 +-
 .../apex/malhar/contrib/rabbitmq/package-info.java |   2 +-
 .../AbstractRedisAggregateOutputOperator.java      |   6 +-
 .../contrib/redis/AbstractRedisInputOperator.java  |  21 +-
 .../apex/malhar/contrib/redis/LettuceStore.java    |  13 +-
 .../apex/malhar/contrib/redis/NumberSummation.java |  44 ++--
 .../redis/RedisKeyValPairOutputOperator.java       |   5 +-
 .../contrib/redis/RedisKeyValueInputOperator.java  |   4 +-
 .../redis/RedisMapAsValueInputOperator.java        |   4 +-
 .../contrib/redis/RedisMapOutputOperator.java      |   2 +-
 ...disNumberSummationKeyValPairOutputOperator.java |   5 +-
 .../RedisNumberSummationMapOutputOperator.java     |   2 +-
 .../contrib/redis/RedisPOJOInputOperator.java      |  38 +--
 .../contrib/redis/RedisPOJOOutputOperator.java     |  14 +-
 .../apex/malhar/contrib/redis/RedisStore.java      |  34 ++-
 .../apex/malhar/contrib/redis/package-info.java    |   2 +-
 .../contrib/romesyndication/RomeFeedEntry.java     |   6 +-
 .../romesyndication/RomeStreamProvider.java        |   2 +-
 .../romesyndication/RomeSyndicationOperator.java   |  30 +--
 .../contrib/romesyndication/package-info.java      |   2 +-
 .../apex/malhar/contrib/ruby/RubyOperator.java     |  58 ++---
 .../contrib/solr/AbstractSolrInputOperator.java    |   8 +-
 .../contrib/solr/AbstractSolrOutputOperator.java   |  12 +-
 .../contrib/solr/CloudSolrServerConnector.java     |   2 +-
 .../solr/ConcurrentUpdateSolrServerConnector.java  |   2 +-
 .../contrib/solr/HttpSolrServerConnector.java      |   2 +-
 .../contrib/solr/LBHttpSolrServerConnector.java    |   2 +-
 .../malhar/contrib/solr/SolrInputOperator.java     |   6 +-
 .../malhar/contrib/solr/SolrOutputOperator.java    |   2 +-
 .../malhar/contrib/solr/SolrServerConnector.java   |   5 +-
 .../apex/malhar/contrib/solr/package-info.java     |   2 +-
 .../splunk/AbstractSplunkInputOperator.java        |  24 +-
 .../contrib/splunk/SplunkInputFromForwarder.java   |  56 +++--
 .../malhar/contrib/splunk/SplunkInputOperator.java |   2 +-
 .../apex/malhar/contrib/splunk/SplunkStore.java    |  38 +--
 .../contrib/splunk/SplunkTcpOutputOperator.java    |  38 +--
 .../apex/malhar/contrib/splunk/package-info.java   |   2 +-
 .../contrib/sqlite/SqliteStreamOperator.java       |  27 +--
 .../apex/malhar/contrib/sqlite/package-info.java   |   2 +-
 .../malhar/contrib/twitter/TwitterSampleInput.java |  40 +--
 .../zmq/AbstractBaseZeroMQInputOperator.java       |  26 +-
 .../zmq/AbstractBaseZeroMQOutputOperator.java      |  10 +-
 .../zmq/AbstractSinglePortZeroMQInputOperator.java |  15 +-
 .../AbstractSinglePortZeroMQOutputOperator.java    |   2 +-
 .../SimpleSinglePortZeroMQPullInputOperator.java   |   5 +-
 ...pleSinglePortZeroMQPullStringInputOperator.java |   2 +-
 .../malhar/contrib/zmq/ZeroMQInputOperator.java    |   5 +-
 .../malhar/contrib/zmq/ZeroMQOutputOperator.java   |  15 +-
 .../apex/malhar/contrib/zmq/package-info.java      |   2 +-
 .../accumulo/AccumuloInputOperatorTest.java        |  29 ++-
 .../accumulo/AccumuloOutputOperatorTest.java       |  30 +--
 .../accumulo/AccumuloRowTupleGenerator.java        |  21 +-
 .../contrib/accumulo/AccumuloTestHelper.java       |  39 +--
 .../malhar/contrib/accumulo/AccumuloTuple.java     |  31 ++-
 .../contrib/accumulo/AccumuloTupleCollector.java   |  18 +-
 .../contrib/aerospike/AerospikeOperatorTest.java   |  93 +++----
 ...rospikePOJONonTransactionalPutOperatorTest.java |  23 +-
 .../AerospikePOJOTransactionalPutOperatorTest.java |  23 +-
 .../contrib/aerospike/AerospikeTestUtils.java      | 123 +++++-----
 .../apachelog/ApacheLogInputGeneratorTest.java     |   6 +-
 .../contrib/apachelog/ApplicationLocalLogTest.java |  18 +-
 .../apachelog/ApplicationLogGeneratorTest.java     |  18 +-
 .../contrib/apachelog/zmq/ApplicationTest.java     |  16 +-
 .../contrib/avro/AvroFileInputOperatorTest.java    |  27 ++-
 .../contrib/avro/AvroFileToPojoModuleTest.java     |   8 +-
 .../apex/malhar/contrib/avro/AvroToPojoTest.java   |   6 +-
 .../apex/malhar/contrib/avro/PojoToAvroTest.java   |   7 +-
 .../AbstractUpsertOutputOperatorCodecsTest.java    |   7 +-
 ...bstractUpsertOutputOperatorCompositePKTest.java |   7 +-
 .../AbstractUpsertOutputOperatorCountersTest.java  |   8 +-
 .../apex/malhar/contrib/cassandra/Address.java     |   2 +-
 .../malhar/contrib/cassandra/AddressCodec.java     |   2 +-
 .../CassandraLookupCacheBackedOperatorTest.java    |  16 +-
 .../contrib/cassandra/CassandraOperatorTest.java   |  33 ++-
 .../contrib/cassandra/CompositePrimaryKeyRow.java  |   2 +-
 .../CompositePrimaryKeyUpdateOperator.java         |   3 +-
 .../contrib/cassandra/CounterColumnTableEntry.java |   2 +-
 .../cassandra/CounterColumnUpdatesOperator.java    |   3 +-
 .../apex/malhar/contrib/cassandra/FullName.java    |   2 +-
 .../malhar/contrib/cassandra/FullNameCodec.java    |   2 +-
 .../malhar/contrib/cassandra/TestInputPojo.java    |   3 +-
 .../apache/apex/malhar/contrib/cassandra/User.java |   2 +-
 .../contrib/cassandra/UserUpsertOperator.java      |   3 +-
 .../malhar/contrib/couchbase/CouchBaseGetTest.java |  20 +-
 .../couchbase/CouchBaseInputOperatorTest.java      |  30 ++-
 .../couchbase/CouchBaseOutputOperatorTest.java     |  28 +--
 .../contrib/couchbase/CouchBasePOJOTest.java       |  39 ++-
 .../malhar/contrib/couchbase/CouchBaseSetTest.java |  17 +-
 .../contrib/couchbase/TestComplexPojoInput.java    |   2 +-
 .../apex/malhar/contrib/couchbase/TestPojo.java    |   3 +-
 .../contrib/couchdb/CouchDBInputOperatorTest.java  |  14 +-
 .../contrib/couchdb/CouchDBOutputOperatorTest.java |  13 +-
 .../couchdb/CouchDBPOJOInputOperatorTest.java      |   8 +-
 .../malhar/contrib/couchdb/CouchDBTestHelper.java  |   8 +-
 .../couchdb/PagedCouchDBInputOperatorTest.java     |  11 +-
 .../apex/malhar/contrib/couchdb/TestInputPOJO.java |   2 +-
 .../elasticsearch/ElasticSearchOperatorTest.java   |  16 +-
 .../elasticsearch/ElasticSearchPercolateTest.java  |  32 ++-
 .../apex/malhar/contrib/enrich/EmployeeOrder.java  |   2 +-
 .../malhar/contrib/enrich/FileEnrichmentTest.java  |   7 +-
 .../apex/malhar/contrib/enrich/JDBCLoaderTest.java |   5 +-
 .../malhar/contrib/enrich/MapEnricherTest.java     |  10 +-
 .../apache/apex/malhar/contrib/enrich/Order.java   |   2 +-
 .../malhar/contrib/enrich/POJOEnricherTest.java    |   6 +-
 .../malhar/contrib/formatter/CsvFormatterTest.java |  12 +-
 .../contrib/geode/GeodeCheckpointStoreTest.java    |   4 +-
 .../geode/GeodeKeyValueStorageAgentTest.java       |   4 +-
 .../malhar/contrib/geode/GeodeOperatorTest.java    |   4 +-
 .../contrib/geode/GeodePOJOOperatorTest.java       |   9 +-
 .../apex/malhar/contrib/geode/GeodeStoreTest.java  |   2 +-
 .../contrib/hbase/HBaseColTupleGenerator.java      |   6 +-
 .../hbase/HBaseCsvMappingPutOperatorTest.java      |  12 +-
 .../malhar/contrib/hbase/HBaseGetOperatorTest.java |   9 +-
 .../hbase/HBaseNameValueCsvPutOperatorTest.java    |   9 +-
 .../contrib/hbase/HBasePOJOInputOperatorTest.java  |  45 ++--
 .../contrib/hbase/HBasePOJOPutOperatorTest.java    | 134 +++++-----
 .../contrib/hbase/HBaseRowStringGenerator.java     |  20 +-
 .../contrib/hbase/HBaseRowTupleGenerator.java      |   6 +-
 .../contrib/hbase/HBaseScanOperatorTest.java       |  10 +-
 .../apex/malhar/contrib/hbase/HBaseTestHelper.java |  70 +++---
 .../HBaseTransactionalAppendOperatorTest.java      |  41 ++--
 .../hbase/HBaseTransactionalPutOperatorTest.java   |  79 +++---
 .../apex/malhar/contrib/hbase/HBaseTuple.java      |   2 +-
 .../malhar/contrib/hbase/HBaseTupleCollector.java  |  27 +--
 .../apex/malhar/contrib/hbase/HBaseUtil.java       |  30 +--
 .../malhar/contrib/helper/CollectorModule.java     |   8 +-
 .../contrib/helper/MessageQueueTestHelper.java     |  11 +-
 .../apex/malhar/contrib/helper/SourceModule.java   |   6 +-
 .../malhar/contrib/jython/PythonOperatorTest.java  |   6 +-
 .../kafka/KafkaExactlyOnceOutputOperatorTest.java  |  16 +-
 .../contrib/kafka/KafkaInputOperatorTest.java      |  30 +--
 .../contrib/kafka/KafkaOperatorTestBase.java       |  28 ++-
 .../contrib/kafka/KafkaOutputOperatorTest.java     |  22 +-
 .../kafka/KafkaPartitionableInputOperatorTest.java |  24 +-
 .../malhar/contrib/kafka/KafkaSimpleConsumer.java  |  11 +-
 .../malhar/contrib/kafka/KafkaTestConsumer.java    |  12 +-
 .../malhar/contrib/kafka/KafkaTestPartitioner.java |   9 +-
 .../malhar/contrib/kafka/KafkaTestProducer.java    |  25 +-
 .../malhar/contrib/kafka/OffsetManagerTest.java    |  49 ++--
 .../contrib/kafka/SimpleKakfaConsumerTest.java     |   5 +-
 .../KinesisByteArrayOutputOperatorTest.java        |  23 +-
 .../contrib/kinesis/KinesisInputOperatorTest.java  |   8 +-
 .../contrib/kinesis/KinesisOperatorTestBase.java   |  30 +--
 .../contrib/kinesis/KinesisOutputOperatorTest.java |  48 ++--
 .../KinesisPartitionableInputOperatorTest.java     |  13 +-
 .../kinesis/KinesisStringOutputOperatorTest.java   |   7 +-
 .../contrib/kinesis/KinesisTestConsumer.java       |  44 ++--
 .../contrib/kinesis/KinesisTestProducer.java       |  21 +-
 .../malhar/contrib/kinesis/ShardManagerTest.java   |  57 ++---
 .../contrib/memcache/MemcacheOperatorTest.java     |  10 +-
 .../contrib/memcache/MemcachePOJOOperatorTest.java |  24 +-
 .../MemcacheWhalinOperatorTest.java                |   4 +-
 .../memsql/AbstractMemsqlInputOperatorTest.java    |  57 +++--
 .../memsql/AbstractMemsqlOutputOperatorTest.java   |  55 ++---
 .../malhar/contrib/memsql/MemsqlInputOperator.java |  12 +-
 .../malhar/contrib/memsql/MemsqlStoreTest.java     |   2 +-
 .../apex/malhar/contrib/memsql/TestInputPojo.java  |   2 +-
 .../algo/AbstractStreamPatternMatcherTest.java     |   3 +-
 .../contrib/misc/algo/AllAfterMatchMapTest.java    |   2 +-
 .../malhar/contrib/misc/algo/DistinctMapTest.java  |   2 +-
 .../contrib/misc/algo/FilterKeyValsTest.java       |   2 +-
 .../contrib/misc/algo/FilterKeysHashMapTest.java   |   2 +-
 .../contrib/misc/algo/FilterKeysMapTest.java       |   2 +-
 .../contrib/misc/algo/FirstMatchMapTest.java       |   2 +-
 .../apex/malhar/contrib/misc/algo/FirstNTest.java  |   2 +-
 .../contrib/misc/algo/FirstTillMatchTest.java      |   2 +-
 .../contrib/misc/algo/InsertSortDescTest.java      |   2 +-
 .../contrib/misc/algo/InvertIndexArrayTest.java    |   4 +-
 .../malhar/contrib/misc/algo/InvertIndexTest.java  |   4 +-
 .../malhar/contrib/misc/algo/LastMatchMapTest.java |   2 +-
 .../contrib/misc/algo/LeastFrequentKeyMapTest.java |   2 +-
 .../misc/algo/LeastFrequentKeyValueMapTest.java    |   2 +-
 .../malhar/contrib/misc/algo/MatchMapTest.java     |   6 +-
 .../contrib/misc/algo/MostFrequentKeyMapTest.java  |   2 +-
 .../misc/algo/MostFrequentKeyValueMapTest.java     |   2 +-
 .../apex/malhar/contrib/misc/algo/SamplerTest.java |   2 +-
 .../contrib/misc/math/ChangeAlertKeyValTest.java   |   4 +-
 .../contrib/misc/math/ChangeAlertMapTest.java      |   2 +-
 .../malhar/contrib/misc/math/ChangeAlertTest.java  |   4 +-
 .../malhar/contrib/misc/math/ChangeKeyValTest.java |   4 +-
 .../apex/malhar/contrib/misc/math/ChangeTest.java  |   2 +-
 .../contrib/misc/math/CompareExceptMapTest.java    |   2 +-
 .../malhar/contrib/misc/math/CompareMapTest.java   |   2 +-
 .../malhar/contrib/misc/math/CountKeyValTest.java  |   4 +-
 .../malhar/contrib/misc/math/ExceptMapTest.java    |   2 +-
 .../malhar/contrib/misc/math/QuotientMapTest.java  |   2 +-
 .../malhar/contrib/misc/math/SumCountMapTest.java  |   2 +-
 .../misc/streamquery/DeleteOperatorTest.java       |   3 +-
 .../streamquery/FullOuterJoinOperatorTest.java     |   9 +-
 .../misc/streamquery/GroupByOperatorTest.java      |   5 +-
 .../misc/streamquery/HavingOperatorTest.java       |   5 +-
 .../misc/streamquery/InnerJoinOperatorTest.java    |  10 +-
 .../streamquery/LeftOuterJoinOperatorTest.java     |   8 +-
 .../misc/streamquery/OrderByOperatorTest.java      |   4 +-
 .../streamquery/RightOuterJoinOperatorTest.java    |   8 +-
 .../misc/streamquery/SelectOperatorTest.java       |   5 +-
 .../misc/streamquery/SelectTopOperatorTest.java    |   2 +-
 .../misc/streamquery/UpdateOperatorTest.java       |   3 +-
 .../streamquery/advanced/BetweenConditionTest.java |   5 +-
 .../advanced/CompoundConditionTest.java            |   5 +-
 .../misc/streamquery/advanced/InConditionTest.java |   5 +-
 .../streamquery/advanced/LikeConditionTest.java    |   5 +-
 .../misc/streamquery/advanced/NegateIndexTest.java |   3 +-
 .../streamquery/advanced/SelectAverageTest.java    |   3 +-
 .../misc/streamquery/advanced/SelectCountTest.java |   3 +-
 .../streamquery/advanced/SelectFirstLastTest.java  |   3 +-
 .../streamquery/advanced/SelectMaxMinTest.java     |   3 +-
 .../misc/streamquery/advanced/SumIndexTest.java    |   3 +-
 .../contrib/mongodb/MongoDBInputOperatorTest.java  |  20 +-
 .../contrib/mongodb/MongoDBOutputOperatorTest.java |  32 ++-
 .../apex/malhar/contrib/mongodb/TestPOJO.java      |   2 +-
 .../malhar/contrib/mqtt/MqttInputOperatorTest.java |  31 +--
 .../contrib/mqtt/MqttOutputOperatorTest.java       |  30 +--
 .../nifi/NiFiSinglePortInputOperatorTest.java      |  15 +-
 .../nifi/NiFiSinglePortOutputOperatorTest.java     |  29 +--
 .../nifi/demo/TestNiFiInputApplication.java        |   6 +-
 .../nifi/demo/TestNiFiOutputApplication.java       |  17 +-
 .../malhar/contrib/nifi/mock/MockDataPacket.java   |   2 +-
 .../contrib/nifi/mock/MockSiteToSiteClient.java    |   2 +-
 .../malhar/contrib/nifi/mock/MockTransaction.java  |   2 +-
 .../contrib/parquet/ParquetFilePOJOReaderTest.java |  37 ++-
 .../apex/malhar/contrib/parser/CSVParserTest.java  |  34 +--
 .../malhar/contrib/parser/CommonLogParserTest.java |   3 +-
 .../malhar/contrib/parser/CsvPOJOParserTest.java   |   8 +-
 .../apex/malhar/contrib/parser/FixedWidthTest.java |  10 +-
 .../contrib/parser/JsonParserApplicationTest.java  |   8 +-
 .../apex/malhar/contrib/parser/JsonParserTest.java |  10 +-
 .../apex/malhar/contrib/parser/LogParserTest.java  |  36 +--
 .../malhar/contrib/parser/RegexParserTest.java     |  38 ++-
 .../contrib/parser/StreamingJsonParserTest.java    |   8 +-
 .../apex/malhar/contrib/r/RMaxOperatorTest.java    |   6 +-
 .../apex/malhar/contrib/r/RMinOperatorTest.java    |   6 +-
 .../r/RScriptLinearRegressionPredictorTest.java    |  14 +-
 .../contrib/r/RScriptOperatorBooleanTest.java      |  16 +-
 .../contrib/r/RScriptOperatorDoubleArrayTest.java  |  10 +-
 .../malhar/contrib/r/RScriptOperatorIntTest.java   |   6 +-
 .../malhar/contrib/r/RScriptOperatorRealTest.java  |   8 +-
 .../malhar/contrib/r/RScriptOperatorStrTest.java   |   4 +-
 .../contrib/r/RStandardDeviationOperatorTest.java  |   8 +-
 .../rabbitmq/RabbitMQInputOperatorBenchmark.java   |   2 +-
 .../rabbitmq/RabbitMQInputOperatorTest.java        |  22 +-
 .../rabbitmq/RabbitMQOutputOperatorBenchmark.java  |   2 +-
 .../rabbitmq/RabbitMQOutputOperatorTest.java       |  14 +-
 .../contrib/redis/RedisInputOperatorTest.java      |  15 +-
 .../malhar/contrib/redis/RedisOperatorTest.java    |   4 +-
 .../contrib/redis/RedisPOJOOperatorTest.java       |  20 +-
 .../RomeSyndicationOperatorTest.java               |  25 +-
 .../apex/malhar/contrib/ruby/RubyOperatorTest.java |  18 +-
 .../splunk/SplunkInputFromForwarderTest.java       |  17 +-
 .../contrib/splunk/SplunkInputOperatorTest.java    |  11 +-
 .../splunk/SplunkTcpOutputOperatorTest.java        |  32 +--
 .../util/FieldValueSerializableGenerator.java      |  50 ++--
 .../contrib/util/POJOTupleGenerateOperator.java    |  36 ++-
 .../apache/apex/malhar/contrib/util/TestPOJO.java  |  64 ++---
 .../contrib/util/TupleCacheOutputOperator.java     |  13 +-
 .../contrib/util/TupleGenerateCacheOperator.java   |   9 +-
 .../apex/malhar/contrib/util/TupleGenerator.java   |  33 +--
 .../contrib/zmq/ZeroMQInputOperatorBenchmark.java  |   5 +-
 .../contrib/zmq/ZeroMQInputOperatorTest.java       |  21 +-
 .../malhar/contrib/zmq/ZeroMQMessageGenerator.java |  12 +-
 .../malhar/contrib/zmq/ZeroMQMessageReceiver.java  |  13 +-
 .../contrib/zmq/ZeroMQOutputOperatorBenchmark.java |   2 +-
 .../contrib/zmq/ZeroMQOutputOperatorTest.java      |  21 +-
 examples/csvformatter/pom.xml                      |   2 +-
 .../apex/examples/csvformatter/Application.java    |   6 +-
 .../examples/csvformatter/HDFSOutputOperator.java  |   3 +-
 examples/dedup/pom.xml                             |   2 +-
 .../apache/apex/examples/dedup/Application.java    |   2 +-
 examples/distributedistinct/pom.xml                |   2 +-
 .../examples/distributeddistinct/Application.java  |  10 +-
 .../distributeddistinct/CountVerifier.java         |   3 +-
 .../IntegerUniqueValueCountAppender.java           |   4 +-
 .../distributeddistinct/RandomKeyValGenerator.java |   5 +-
 .../distributeddistinct/StatefulApplication.java   |   8 +-
 .../UniqueValueCountAppender.java                  |   7 +-
 .../DistributedDistinctTest.java                   |   8 +-
 .../StatefulUniqueCountTest.java                   |   5 +-
 examples/dynamic-partition/pom.xml                 |   2 +-
 .../java/org/apache/apex/examples/dynamic/App.java |   3 +-
 examples/echoserver/pom.xml                        |   2 +-
 examples/enricher/pom.xml                          |   2 +-
 .../examples/enricher/EnricherAppWithJSONFile.java |   6 +-
 .../apex/examples/enricher/LineOutputOperator.java |   2 +-
 examples/exactly-once/pom.xml                      |   2 +-
 .../exactlyonce/ExactlyOnceFileOutputApp.java      |   6 +-
 .../exactlyonce/ExactlyOnceJdbcOutputApp.java      |  10 +-
 .../exactlyonce/ExactlyOnceJdbcOutputTest.java     |   2 +-
 examples/filter/pom.xml                            |   2 +-
 .../apache/apex/examples/filter/Application.java   |   6 +-
 examples/frauddetect/pom.xml                       |   2 +-
 .../apex/examples/frauddetect/Application.java     |  14 +-
 .../frauddetect/AverageAlertingOperator.java       |   3 +-
 .../apex/examples/frauddetect/BankIdNumberKey.java |   2 +-
 .../frauddetect/BankIdNumberSamplerOperator.java   |   4 +-
 .../CreditCardAmountSamplerOperator.java           |   2 +-
 .../MerchantTransactionBucketOperator.java         |   2 +-
 .../frauddetect/SlidingWindowSumKeyVal.java        |   6 +-
 .../frauddetect/SlidingWindowSumObject.java        |   3 +-
 .../frauddetect/TransactionStatsAggregator.java    |   4 +-
 .../operator/HdfsStringOutputOperator.java         |   3 +-
 examples/ftp/pom.xml                               |   2 +-
 .../org/apache/apex/examples/ftp/Application.java  |   2 +-
 examples/highlevelapi/pom.xml                      |   2 +-
 .../malhar/stream/sample/MinimalWordCount.java     |   2 +-
 .../malhar/stream/sample/WindowedWordCount.java    |   2 +-
 .../stream/sample/complete/AutoComplete.java       |   2 +-
 .../sample/complete/StreamingWordExtract.java      |   6 +-
 .../sample/complete/TopWikipediaSessions.java      |   2 +-
 .../stream/sample/complete/TrafficRoutes.java      |   2 +-
 .../sample/complete/TwitterAutoComplete.java       |   4 +-
 .../sample/cookbook/CombinePerKeyExamples.java     |   2 +-
 .../stream/sample/cookbook/MaxPerKeyExamples.java  |  14 +-
 .../stream/sample/cookbook/TriggerExample.java     |   3 +-
 .../stream/sample/WindowedWordCountTest.java       |   2 +-
 .../sample/complete/StreamingWordExtractTest.java  |   2 +-
 .../stream/sample/complete/TrafficRoutesTest.java  |   2 +-
 .../sample/cookbook/MaxPerKeyExamplesTest.java     |   2 +-
 examples/iteration/pom.xml                         |   2 +-
 .../apex/examples/iteration/Application.java       |   2 +-
 examples/jdbc/pom.xml                              |   2 +-
 .../FileToJdbcApp/FileToJdbcCsvParser.java         |  10 +-
 .../FileToJdbcApp/FileToJdbcCustomParser.java      |   6 +-
 .../JdbcIngest/FileLineOutputOperator.java         |   2 +-
 .../apex/examples/JdbcIngest/JdbcHDFSApp.java      |   8 +-
 .../examples/JdbcIngest/JdbcPollerApplication.java |   8 +-
 .../apex/examples/JdbcToJdbc/JdbcToJdbcApp.java    |  22 +-
 .../examples/FileToJdbcApp/ApplicationTest.java    |   2 +-
 .../apex/examples/JdbcToJdbc/JdbcOperatorTest.java |   6 +-
 examples/kafka/pom.xml                             |   2 +-
 .../kafka/exactlyonceoutput/ValidationToFile.java  |   3 +-
 .../examples/kafka/hdfs2kafka/Application.java     |   2 +-
 .../kafka/kafka2hdfs/LineOutputOperator.java       |   2 +-
 examples/machinedata/pom.xml                       |   2 +-
 .../apex/examples/machinedata/Application.java     |   4 +-
 .../machinedata/operator/CalculatorOperator.java   |   5 +-
 .../operator/MachineInfoAveragingOperator.java     |   5 +-
 .../MachineInfoAveragingPrerequisitesOperator.java |   2 +-
 .../operator/MachineInfoAveragingUnifier.java      |   3 +-
 .../machinedata/CalculatorOperatorTest.java        |   8 +-
 examples/mobile/pom.xml                            |   2 +-
 .../apache/apex/examples/mobile/Application.java   |  10 +-
 .../examples/mobile/PhoneMovementGenerator.java    |   4 +-
 .../apex/examples/mobile/ApplicationTest.java      |  10 +-
 examples/mrmonitor/pom.xml                         |   2 +-
 .../apex/examples/mrmonitor/Application.java       |   4 +-
 .../mrmonitor/MRMonitoringApplication.java         |   5 +-
 .../mrmonitor/MrMonitoringApplicationTest.java     |   2 +-
 examples/mroperator/pom.xml                        |   2 +-
 .../mroperator/HdfsKeyValOutputOperator.java       |   4 +-
 .../apex/examples/mroperator/MapOperator.java      |   3 +-
 .../examples/mroperator/OutputCollectorImpl.java   |   2 +-
 .../apex/examples/mroperator/ReduceOperator.java   |   2 +-
 .../apex/examples/mroperator/MapOperatorTest.java  |   3 +-
 .../examples/mroperator/ReduceOperatorTest.java    |   5 +-
 examples/nyctaxi/pom.xml                           |   2 +-
 .../apache/apex/examples/nyctaxi/Application.java  |   6 +-
 .../apex/examples/nyctaxi/NycTaxiDataServer.java   |   2 +-
 .../examples/nyctaxi/NycTaxiZipFareExtractor.java  |   2 +-
 examples/partition/pom.xml                         |   2 +-
 .../org/apache/apex/examples/partition/Codec3.java |   2 +-
 examples/pi/pom.xml                                |   2 +-
 .../org/apache/apex/examples/pi/Application.java   |   6 +-
 .../apex/examples/pi/ApplicationAppData.java       |  14 +-
 .../apex/examples/pi/ApplicationWithScript.java    |  14 +-
 .../org/apache/apex/examples/pi/Calculator.java    |  22 +-
 .../pi/src/main/resources/app/PiJsonExample.json   |   4 +-
 examples/pom.xml                                   |   2 +-
 examples/r/pom.xml                                 |   2 +-
 .../examples/r/oldfaithful/FaithfulRScript.java    |   3 +-
 .../r/oldfaithful/OldFaithfulApplication.java      |   2 +-
 examples/recordReader/pom.xml                      |   2 +-
 .../apex/examples/recordReader/Application.java    |   4 +-
 examples/s3/pom.xml                                |   2 +-
 .../apache/apex/examples/s3Output/Application.java |   2 +-
 .../s3ToHdfsSync/S3ToHDFSSyncApplication.java      |   4 +-
 .../META-INF/properties-s3TupleOutput.xml          |   2 +-
 examples/sql/pom.xml                               |   2 +-
 .../sql/sample/FusionStyleSQLApplication.java      |   2 +-
 examples/throttle/pom.xml                          |   2 +-
 examples/transform/pom.xml                         |   2 +-
 .../transform/DynamicTransformApplication.java     |   4 +-
 .../transform/SimpleTransformApplication.java      |   2 +-
 examples/twitter/pom.xml                           |   2 +-
 .../twitter/KinesisHashtagsApplication.java        |  24 +-
 .../examples/twitter/TwitterDumpApplication.java   |   5 +-
 .../twitter/TwitterDumpHBaseApplication.java       |   5 +-
 .../twitter/TwitterTopCounterApplication.java      |  19 +-
 .../twitter/TwitterTopWordsApplication.java        |   4 +-
 .../TwitterTrendingHashtagsApplication.java        |   8 +-
 .../examples/twitter/TwitterTopCounterTest.java    |   3 +-
 .../apex/examples/twitter/TwitterTopWordsTest.java |   3 +-
 examples/uniquecount/pom.xml                       |   2 +-
 .../apex/examples/uniquecount/Application.java     |  12 +-
 .../apex/examples/uniquecount/CountVerifier.java   |   3 +-
 .../examples/uniquecount/RandomDataGenerator.java  |   3 +-
 .../apex/examples/uniquecount/RandomKeyValues.java |   3 +-
 .../examples/uniquecount/RandomKeysGenerator.java  |   2 +-
 .../uniquecount/UniqueKeyValCountExample.java      |   9 +-
 examples/wordcount/pom.xml                         |   2 +-
 .../apex/examples/wordcount/Application.java       |   8 +-
 .../wordcount/ApplicationWithQuerySupport.java     |  11 +-
 .../apache/apex/examples/wordcount/LineReader.java |   2 +-
 .../examples/wordcount/WordCountInputOperator.java |   2 +-
 .../apex/examples/wordcount/WordCountWriter.java   |   2 +-
 examples/yahoofinance/pom.xml                      |   2 +-
 .../yahoofinance/ApplicationWithDerbySQL.java      |   2 +-
 .../apex/examples/yahoofinance/StockTickInput.java |   2 +-
 .../yahoofinance/YahooFinanceApplication.java      |  40 +--
 .../yahoofinance/YahooFinanceCSVInputOperator.java |   2 +-
 .../src/test/resources/alert_create.json           |   6 +-
 flume/pom.xml                                      |   2 +-
 .../apex/malhar/flume/storage/HDFSStorage.java     |   3 +-
 hive/pom.xml                                       |   2 +-
 .../hive/AbstractFSRollingOutputOperator.java      |   4 +-
 .../apex/malhar/hive/FSPojoToHiveOperator.java     |  22 +-
 .../org/apache/apex/malhar/hive/HiveOperator.java  |   8 +-
 .../apache/apex/malhar/hive/HiveOutputModule.java  |   5 +-
 .../org/apache/apex/malhar/hive/HiveStore.java     |   4 +-
 .../apache/apex/malhar/hive/HiveStreamCodec.java   |   6 +-
 .../org/apache/apex/malhar/hive/package-info.java  |   2 +-
 .../apex/malhar/hive/FSRollingMapTestImpl.java     |   2 +-
 .../apache/apex/malhar/hive/FSRollingTestImpl.java |   2 +-
 .../org/apache/apex/malhar/hive/HiveMockTest.java  |  10 +-
 .../org/apache/apex/malhar/hive/HiveStoreTest.java |   2 +-
 kafka/kafka-common/pom.xml                         |   2 +-
 .../malhar/kafka/AbstractKafkaPartitioner.java     |   2 +-
 kafka/kafka010/pom.xml                             |   2 +-
 .../apex/malhar/kafka/KafkaOperatorTestBase.java   |   2 +-
 kafka/kafka09/pom.xml                              |   2 +-
 .../apex/malhar/kafka/KafkaOperatorTestBase.java   |   2 +-
 .../apex/malhar/kafka/KafkaOutputOperatorTest.java |   2 +-
 kafka/pom.xml                                      |   2 +-
 kudu/pom.xml                                       |   2 +-
 .../malhar/kudu/AbstractKuduInputOperator.java     |   2 +-
 .../malhar/kudu/AbstractKuduOutputOperator.java    |   2 +-
 .../apex/malhar/kudu/ApexKuduConnection.java       |   7 +-
 .../partitioner/AbstractKuduInputPartitioner.java  |   2 +-
 .../kudu/scanner/KuduPartitionScannerCallable.java |   3 +-
 .../kudu/IncrementalStepScanInputOperatorTest.java |   4 +-
 .../apex/malhar/kudu/KuduClientTestCommons.java    |   3 +-
 .../KuduCreateUpdateDeleteOutputOperatorTest.java  |   4 +-
 .../apex/malhar/kudu/KuduInputOperatorCommons.java |   4 +-
 .../partitioner/KuduOneToManyPartitionerTest.java  |   2 +-
 .../partitioner/KuduOneToOnePartitionerTest.java   |   2 +-
 library/pom.xml                                    |   2 +-
 .../apache/apex/malhar/lib/algo/BottomNMap.java    |   6 +-
 .../apex/malhar/lib/algo/BottomNUnifier.java       |   5 +-
 .../apex/malhar/lib/algo/BottomNUniqueMap.java     |   6 +-
 .../malhar/lib/algo/CompareExceptCountMap.java     |   6 +-
 .../org/apache/apex/malhar/lib/algo/Distinct.java  |   6 +-
 .../apache/apex/malhar/lib/algo/FilterValues.java  |   2 +-
 .../apache/apex/malhar/lib/algo/InsertSort.java    |   6 +-
 .../lib/algo/LeastFrequentKeyArrayUnifier.java     |   2 +-
 .../malhar/lib/algo/LeastFrequentKeyUnifier.java   |   2 +-
 .../apex/malhar/lib/algo/LeastFrequentValue.java   |   6 +-
 .../apache/apex/malhar/lib/algo/MatchAllMap.java   |   8 +-
 .../apache/apex/malhar/lib/algo/MatchAnyMap.java   |   8 +-
 .../org/apache/apex/malhar/lib/algo/MatchMap.java  |   8 +-
 .../org/apache/apex/malhar/lib/algo/MergeSort.java |   2 +-
 .../apex/malhar/lib/algo/MergeSortNumber.java      |   2 +-
 .../apex/malhar/lib/algo/MostFrequentValue.java    |  10 +-
 .../java/org/apache/apex/malhar/lib/algo/TopN.java |   6 +-
 .../apache/apex/malhar/lib/algo/TopNUnique.java    |   6 +-
 .../apache/apex/malhar/lib/algo/UniqueCounter.java |   7 +-
 .../apex/malhar/lib/algo/UniqueValueCount.java     |   5 +-
 .../apache/apex/malhar/lib/algo/package-info.java  |   2 +-
 .../malhar/lib/appdata/AbstractAppDataServer.java  |   1 -
 .../apache/apex/malhar/lib/appdata/QueueUtils.java |   2 +-
 .../apache/apex/malhar/lib/appdata/StoreUtils.java |   5 +-
 .../datastructs/CacheLRUSynchronousFlush.java      |   2 +-
 .../lib/appdata/datastructs/DimensionalTable.java  |   2 +-
 .../appdata/datastructs/NOPCacheFlushListener.java |   4 +-
 .../malhar/lib/appdata/gpo/GPOByteArrayList.java   |   2 +-
 .../apex/malhar/lib/appdata/gpo/GPOGetters.java    |  20 +-
 .../apex/malhar/lib/appdata/gpo/GPOMutable.java    |  10 +-
 .../apex/malhar/lib/appdata/gpo/GPOType.java       |  61 +++--
 .../apex/malhar/lib/appdata/gpo/GPOUtils.java      |  31 ++-
 .../apache/apex/malhar/lib/appdata/gpo/Serde.java  |   2 +-
 .../lib/appdata/gpo/SerdeFieldsDescriptor.java     |   7 +-
 .../lib/appdata/gpo/SerdeListGPOMutable.java       |   5 +-
 .../malhar/lib/appdata/gpo/SerdeListPrimitive.java |   5 +-
 .../malhar/lib/appdata/gpo/SerdeListString.java    |   2 +-
 .../malhar/lib/appdata/gpo/SerdeMapPrimitive.java  |   5 +-
 .../lib/appdata/gpo/SerdeObjectPayloadFix.java     |   2 +-
 .../apex/malhar/lib/appdata/package-info.java      |   2 +-
 .../query/AbstractWindowEndQueueManager.java       |   7 +-
 .../query/AppDataWindowEndQueueManager.java        |   7 +-
 .../apex/malhar/lib/appdata/query/QueryBundle.java |   2 +-
 .../malhar/lib/appdata/query/QueryExecutor.java    |   2 +-
 .../appdata/query/QueryManagerAsynchronous.java    |   7 +-
 .../lib/appdata/query/QueryManagerSynchronous.java |   2 +-
 .../apex/malhar/lib/appdata/query/QueueList.java   |   2 +-
 .../malhar/lib/appdata/query/QueueManager.java     |   2 +-
 .../lib/appdata/query/SimpleDoneQueueManager.java  |   5 +-
 .../lib/appdata/query/SimpleQueueManager.java      |   5 +-
 .../lib/appdata/query/WindowBoundedService.java    |   2 +-
 .../lib/appdata/query/WindowEndQueueManager.java   |   5 +-
 .../query/serde/CustomMessageDeserializer.java     |   4 +-
 .../query/serde/CustomMessageSerializer.java       |   6 +-
 .../query/serde/CustomMessageValidator.java        |   4 +-
 .../query/serde/DataQuerySnapshotDeserializer.java |  12 +-
 .../query/serde/DataQuerySnapshotValidator.java    |  12 +-
 .../query/serde/DataResultSnapshotSerializer.java  |  16 +-
 .../query/serde/MessageDeserializerFactory.java    |   6 +-
 .../query/serde/MessageDeserializerInfo.java       |   2 +-
 .../query/serde/MessageSerializerFactory.java      |   8 +-
 .../appdata/query/serde/MessageSerializerInfo.java |   2 +-
 .../lib/appdata/query/serde/MessageType.java       |   2 +-
 .../appdata/query/serde/MessageValidatorInfo.java  |   2 +-
 .../query/serde/SchemaQueryDeserializer.java       |  10 +-
 .../query/serde/SimpleDataDeserializer.java        |   4 +-
 .../appdata/query/serde/SimpleDataSerializer.java  |   6 +-
 .../appdata/query/serde/SimpleDataValidator.java   |   4 +-
 .../lib/appdata/schemas/CustomTimeBucket.java      |   2 +-
 .../lib/appdata/schemas/DataQuerySnapshot.java     |  14 +-
 .../lib/appdata/schemas/DataResultSnapshot.java    |  12 +-
 .../schemas/DimensionalConfigurationSchema.java    |   4 +-
 .../lib/appdata/schemas/DimensionalSchema.java     |   2 +-
 .../apex/malhar/lib/appdata/schemas/Fields.java    |   2 +-
 .../lib/appdata/schemas/FieldsDescriptor.java      |   8 +-
 .../apex/malhar/lib/appdata/schemas/JSONType.java  |   2 +-
 .../apex/malhar/lib/appdata/schemas/Message.java   |   2 +-
 .../apex/malhar/lib/appdata/schemas/QRBase.java    |   2 +-
 .../apex/malhar/lib/appdata/schemas/Query.java     |   2 +-
 .../apex/malhar/lib/appdata/schemas/Result.java    |   2 +-
 .../lib/appdata/schemas/ResultFormatter.java       |   2 +-
 .../apex/malhar/lib/appdata/schemas/Schema.java    |   2 +-
 .../malhar/lib/appdata/schemas/SchemaQuery.java    |  12 +-
 .../malhar/lib/appdata/schemas/SchemaRegistry.java |   2 +-
 .../appdata/schemas/SchemaRegistryMultiple.java    |   8 +-
 .../lib/appdata/schemas/SchemaRegistrySingle.java  |   2 +-
 .../malhar/lib/appdata/schemas/SchemaResult.java   |   8 +-
 .../appdata/schemas/SchemaResultSerializer.java    |   4 +-
 .../malhar/lib/appdata/schemas/SchemaUtils.java    |   2 +-
 .../malhar/lib/appdata/schemas/SnapshotSchema.java |   2 +-
 .../malhar/lib/appdata/schemas/TimeBucket.java     |   2 +-
 .../apex/malhar/lib/appdata/schemas/Type.java      |   2 +-
 .../snapshot/AbstractAppDataSnapshotServer.java    |  36 +--
 .../appdata/snapshot/AppDataSnapshotServerMap.java |   8 +-
 .../snapshot/AppDataSnapshotServerPOJO.java        |   8 +-
 .../lib/bandwidth/BandwidthLimitingOperator.java   |   2 +-
 .../malhar/lib/bandwidth/BandwidthManager.java     |   2 +-
 .../malhar/lib/bandwidth/BandwidthPartitioner.java |   2 +-
 .../lib/codec/JavaSerializationStreamCodec.java    |   2 +-
 .../apex/malhar/lib/codec/KryoJdkContainer.java    |   2 +-
 .../lib/codec/KryoSerializableStreamCodec.java     |   2 +-
 .../apache/apex/malhar/lib/codec/package-info.java |   2 +-
 .../ByteArrayToStringConverterOperator.java        |   2 +-
 .../apex/malhar/lib/converter/Converter.java       |   2 +-
 .../converter/MapToKeyHashValuePairConverter.java  |   5 +-
 .../lib/converter/MapToKeyValuePairConverter.java  |   5 +-
 .../StringValueToNumberConverterForMap.java        |   2 +-
 .../apex/malhar/lib/converter/package-info.java    |   2 +-
 .../apex/malhar/lib/counters/BasicCounters.java    |   2 +-
 .../apex/malhar/lib/counters/package-info.java     |   2 +-
 ...TransactionableKeyValueStoreOutputOperator.java |   2 +-
 ...ggregateTransactionableStoreOutputOperator.java |   2 +-
 ...actBatchTransactionableStoreOutputOperator.java |   2 +-
 .../lib/db/AbstractKeyValueStoreInputOperator.java |   2 +-
 ...TransactionableKeyValueStoreOutputOperator.java |   2 +-
 ...PassThruTransactionableStoreOutputOperator.java |   2 +-
 .../malhar/lib/db/AbstractStoreInputOperator.java  |   2 +-
 .../malhar/lib/db/AbstractStoreOutputOperator.java |   2 +-
 ...AbstractTransactionableStoreOutputOperator.java |   2 +-
 .../org/apache/apex/malhar/lib/db/Connectable.java |   2 +-
 .../apache/apex/malhar/lib/db/KeyValueStore.java   |   2 +-
 .../apache/apex/malhar/lib/db/Transactionable.java |   2 +-
 .../lib/db/TransactionableKeyValueStore.java       |   2 +-
 .../apex/malhar/lib/db/TransactionableStore.java   |   2 +-
 .../cache/AbstractDBLookupCacheBackedOperator.java |   7 +-
 .../apex/malhar/lib/db/cache/CacheManager.java     |   5 +-
 .../apex/malhar/lib/db/cache/CacheStore.java       |   2 +-
 .../apex/malhar/lib/db/cache/package-info.java     |   2 +-
 .../lib/db/jdbc/AbstractJdbcInputOperator.java     |   6 +-
 ...tJdbcNonTransactionableBatchOutputOperator.java |   2 +-
 ...stractJdbcNonTransactionableOutputOperator.java |   5 +-
 .../db/jdbc/AbstractJdbcPOJOOutputOperator.java    |  21 +-
 .../lib/db/jdbc/AbstractJdbcPollInputOperator.java |   8 +-
 .../AbstractJdbcTransactionableOutputOperator.java |   5 +-
 .../lib/db/jdbc/JDBCDimensionalOutputOperator.java |  12 +-
 .../lib/db/jdbc/JDBCLookupCacheBackedOperator.java |   6 +-
 .../apex/malhar/lib/db/jdbc/JdbcFieldInfo.java     |   4 +-
 .../lib/db/jdbc/JdbcNonTransactionalStore.java     |   2 +-
 .../malhar/lib/db/jdbc/JdbcPOJOInputOperator.java  |   7 +-
 .../lib/db/jdbc/JdbcPOJOInsertOutputOperator.java  |   5 +-
 .../db/jdbc/JdbcPOJONonInsertOutputOperator.java   |   2 +-
 .../lib/db/jdbc/JdbcPOJOPollInputOperator.java     |   8 +-
 .../malhar/lib/db/jdbc/JdbcPollInputOperator.java  |   2 +-
 .../apache/apex/malhar/lib/db/jdbc/JdbcStore.java  |   5 +-
 .../malhar/lib/db/jdbc/JdbcTransactionalStore.java |   4 +-
 .../apex/malhar/lib/db/jdbc/package-info.java      |   2 +-
 .../apache/apex/malhar/lib/db/package-info.java    |   2 +-
 .../RedshiftJdbcTransactionableOutputOperator.java |   2 +-
 .../lib/db/redshift/RedshiftOutputModule.java      |   2 +-
 .../apex/malhar/lib/dedup/AbstractDeduper.java     |   2 +-
 .../malhar/lib/dedup/BoundedDedupOperator.java     |   5 +-
 .../apex/malhar/lib/dedup/DeduperStreamCodec.java  |   6 +-
 .../malhar/lib/dedup/TimeBasedDedupOperator.java   |   4 +-
 .../lib/dimensions/CustomTimeBucketRegistry.java   |   4 +-
 .../dimensions/DimensionsConversionContext.java    |   4 +-
 .../lib/dimensions/DimensionsDescriptor.java       |  14 +-
 .../malhar/lib/dimensions/DimensionsEvent.java     |   5 +-
 .../aggregator/AbstractCompositeAggregator.java    |   3 +-
 .../aggregator/AbstractIncrementalAggregator.java  |   9 +-
 .../aggregator/AbstractTopBottomAggregator.java    |   5 +-
 .../dimensions/aggregator/AggregatorAverage.java   |   9 +-
 .../lib/dimensions/aggregator/AggregatorCount.java |   8 +-
 .../dimensions/aggregator/AggregatorCumSum.java    |  16 +-
 .../lib/dimensions/aggregator/AggregatorFirst.java |   6 +-
 .../lib/dimensions/aggregator/AggregatorLast.java  |   6 +-
 .../lib/dimensions/aggregator/AggregatorMax.java   |   8 +-
 .../lib/dimensions/aggregator/AggregatorMin.java   |   8 +-
 .../dimensions/aggregator/AggregatorRegistry.java  |   2 +-
 .../lib/dimensions/aggregator/AggregatorSum.java   |   8 +-
 .../lib/dimensions/aggregator/AggregatorUtils.java |  12 +-
 .../dimensions/aggregator/CompositeAggregator.java |   5 +-
 .../aggregator/IncrementalAggregator.java          |   7 +-
 .../lib/dimensions/aggregator/OTFAggregator.java   |   4 +-
 .../apex/malhar/lib/expression/Expression.java     |   2 +-
 .../lib/expression/JavaExpressionParser.java       |   4 +-
 .../apex/malhar/lib/fileaccess/DTFileReader.java   |   2 +-
 .../apex/malhar/lib/fileaccess/FileAccess.java     |   2 +-
 .../malhar/lib/fileaccess/FileAccessFSImpl.java    |   2 +-
 .../apex/malhar/lib/fileaccess/TFileImpl.java      |   2 +-
 .../apex/malhar/lib/fileaccess/TFileReader.java    |   2 +-
 .../apex/malhar/lib/fileaccess/TFileWriter.java    |   2 +-
 .../apex/malhar/lib/fileaccess/package-info.java   |   2 +-
 .../apex/malhar/lib/filter/FilterOperator.java     |   6 +-
 .../apex/malhar/lib/formatter/Formatter.java       |   5 +-
 .../apex/malhar/lib/formatter/JsonFormatter.java   |   2 +-
 .../apex/malhar/lib/formatter/XmlFormatter.java    |   2 +-
 .../apache/apex/malhar/lib/fs/FSRecordReader.java  |   6 +-
 .../apex/malhar/lib/fs/FSRecordReaderModule.java   |   4 +-
 .../malhar/lib/fs/GenericFileOutputOperator.java   |   5 +-
 .../malhar/lib/fs/LineByLineFileInputOperator.java |   3 +-
 .../malhar/lib/fs/s3/S3BlockUploadOperator.java    |   4 +-
 .../lib/fs/s3/S3InitiateFileUploadOperator.java    |   2 +-
 .../apex/malhar/lib/fs/s3/S3OutputModule.java      |   6 +-
 .../apache/apex/malhar/lib/fs/s3/S3Reconciler.java |   2 +-
 .../lib/fs/s3/S3ReconcilerQueuePartitioner.java    |   3 +-
 .../apex/malhar/lib/fs/s3/S3RecordReader.java      |   5 +-
 .../malhar/lib/fs/s3/S3RecordReaderModule.java     |   3 +-
 .../apex/malhar/lib/fs/s3/S3TupleOutputModule.java |   4 +-
 .../apache/apex/malhar/lib/function/Function.java  |   3 +-
 .../malhar/lib/io/AbstractFTPInputOperator.java    |   4 +-
 .../io/AbstractHttpGetMultiValuedMapOperator.java  |   2 +-
 .../malhar/lib/io/AbstractHttpGetOperator.java     |   2 +-
 .../malhar/lib/io/AbstractHttpInputOperator.java   |   2 +-
 .../apex/malhar/lib/io/AbstractHttpOperator.java   |   2 +-
 .../io/AbstractKeyValueStoreOutputOperator.java    |   5 +-
 .../malhar/lib/io/AbstractSocketInputOperator.java |   2 +-
 .../apex/malhar/lib/io/ApacheGenRandomLogs.java    |   2 +-
 .../io/CollectionMultiConsoleOutputOperator.java   |   2 +-
 .../apex/malhar/lib/io/ConsoleOutputOperator.java  |   2 +-
 .../apex/malhar/lib/io/HttpGetMapOperator.java     |   2 +-
 .../malhar/lib/io/HttpJsonChunksInputOperator.java |   2 +-
 .../apex/malhar/lib/io/HttpLinesInputOperator.java |   2 +-
 .../apex/malhar/lib/io/HttpOutputOperator.java     |   2 +-
 .../apex/malhar/lib/io/HttpPostOutputOperator.java |   2 +-
 .../malhar/lib/io/IdempotentStorageManager.java    |   4 +-
 .../lib/io/MapMultiConsoleOutputOperator.java      |   2 +-
 .../malhar/lib/io/PubSubWebSocketAppDataQuery.java |   7 +-
 .../lib/io/PubSubWebSocketAppDataResult.java       |   2 +-
 .../lib/io/PubSubWebSocketInputOperator.java       |   2 +-
 .../lib/io/PubSubWebSocketOutputOperator.java      |   2 +-
 .../lib/io/SimpleSinglePortInputOperator.java      |   2 +-
 .../apex/malhar/lib/io/SmtpOutputOperator.java     |   2 +-
 .../apex/malhar/lib/io/WebSocketInputOperator.java |   2 +-
 .../malhar/lib/io/WebSocketOutputOperator.java     |   2 +-
 .../lib/io/WebSocketServerInputOperator.java       |   2 +-
 .../apex/malhar/lib/io/WidgetOutputOperator.java   |   2 +-
 .../malhar/lib/io/block/AbstractBlockReader.java   |   6 +-
 .../malhar/lib/io/block/AbstractFSBlockReader.java |   2 +-
 .../apex/malhar/lib/io/block/BlockMetadata.java    |   2 +-
 .../apex/malhar/lib/io/block/BlockWriter.java      |   6 +-
 .../apex/malhar/lib/io/block/FSSliceReader.java    |   2 +-
 .../apex/malhar/lib/io/block/PartFileWriter.java   |   4 +-
 .../apex/malhar/lib/io/block/ReaderContext.java    |   2 +-
 .../apex/malhar/lib/io/block/package-info.java     |   2 +-
 .../lib/io/fs/AbstractFileInputOperator.java       |   7 +-
 .../lib/io/fs/AbstractFileOutputOperator.java      |   4 +-
 .../malhar/lib/io/fs/AbstractFileSplitter.java     |   5 +-
 .../apex/malhar/lib/io/fs/AbstractReconciler.java  |   2 +-
 .../io/fs/AbstractSingleFileOutputOperator.java    |   2 +-
 .../io/fs/AbstractThroughputFileInputOperator.java |   4 +-
 .../io/fs/AbstractWindowFileOutputOperator.java    |   2 +-
 .../apex/malhar/lib/io/fs/FSInputModule.java       |  13 +-
 .../apache/apex/malhar/lib/io/fs/FileMerger.java   |   4 +-
 .../apache/apex/malhar/lib/io/fs/FileSplitter.java |   6 +-
 .../apex/malhar/lib/io/fs/FileSplitterBase.java    |   2 +-
 .../apex/malhar/lib/io/fs/FileSplitterInput.java   |   2 +-
 .../apache/apex/malhar/lib/io/fs/FileStitcher.java |   8 +-
 .../apex/malhar/lib/io/fs/FilterStreamCodec.java   |   2 +-
 .../apex/malhar/lib/io/fs/FilterStreamContext.java |   2 +-
 .../malhar/lib/io/fs/FilterStreamProvider.java     |   2 +-
 .../apex/malhar/lib/io/fs/HDFSFileCopyModule.java  |  10 +-
 .../apex/malhar/lib/io/fs/HDFSFileMerger.java      |   4 +-
 .../apex/malhar/lib/io/fs/S3BlockReader.java       |   8 +-
 .../apex/malhar/lib/io/fs/S3InputModule.java       |   4 +-
 .../apache/apex/malhar/lib/io/fs/Synchronizer.java |  10 +-
 .../apex/malhar/lib/io/fs/TailFsInputOperator.java |   2 +-
 .../apache/apex/malhar/lib/io/fs/package-info.java |   2 +-
 .../lib/io/jms/AbstractJMSInputOperator.java       |   4 +-
 .../lib/io/jms/AbstractJMSOutputOperator.java      |   2 +-
 .../jms/AbstractJMSSinglePortOutputOperator.java   |   2 +-
 .../lib/io/jms/FSPsuedoTransactionableStore.java   |   2 +-
 .../org/apache/apex/malhar/lib/io/jms/JMSBase.java |   2 +-
 .../lib/io/jms/JMSBaseTransactionableStore.java    |   4 +-
 .../lib/io/jms/JMSMultiPortOutputOperator.java     |   2 +-
 .../malhar/lib/io/jms/JMSObjectInputOperator.java  |   2 +-
 .../malhar/lib/io/jms/JMSStringInputOperator.java  |   2 +-
 .../malhar/lib/io/jms/JMSTransactionableStore.java |   2 +-
 .../apex/malhar/lib/io/jms/package-info.java       |   2 +-
 .../apache/apex/malhar/lib/io/package-info.java    |   2 +-
 .../apex/malhar/lib/join/AbstractJoinOperator.java |   2 +-
 .../AbstractManagedStateInnerJoinOperator.java     |   3 +-
 .../apex/malhar/lib/join/AntiJoinOperator.java     |   6 +-
 .../org/apache/apex/malhar/lib/join/Bucket.java    |   2 +-
 .../apache/apex/malhar/lib/join/InMemoryStore.java |   2 +-
 .../org/apache/apex/malhar/lib/join/JoinStore.java |   2 +-
 .../apex/malhar/lib/join/JoinStreamCodec.java      |   4 +-
 .../apex/malhar/lib/join/MapJoinOperator.java      |   2 +-
 .../malhar/lib/join/POJOInnerJoinOperator.java     |   2 +-
 .../apex/malhar/lib/join/POJOJoinOperator.java     |   5 +-
 .../apex/malhar/lib/join/SemiJoinOperator.java     |   6 +-
 .../apex/malhar/lib/join/TimeBasedStore.java       |   2 +-
 .../org/apache/apex/malhar/lib/join/TimeEvent.java |   2 +-
 .../apache/apex/malhar/lib/join/TimeEventImpl.java |   2 +-
 .../lib/logs/ApacheLogParseMapOutputOperator.java  |   2 +-
 .../malhar/lib/logs/ApacheLogParseOperator.java    |   2 +-
 .../lib/logs/ApacheVirtualLogParseOperator.java    |   4 +-
 .../lib/logs/DimensionAggregationUnifier.java      |   2 +-
 .../apex/malhar/lib/logs/DimensionObject.java      |   2 +-
 .../lib/logs/FilteredLineToTokenArrayList.java     |   2 +-
 .../lib/logs/FilteredLineToTokenHashMap.java       |   2 +-
 .../lib/logs/FilteredLineTokenizerKeyVal.java      |   2 +-
 .../apex/malhar/lib/logs/InformationExtractor.java |   2 +-
 .../apex/malhar/lib/logs/LineToTokenArrayList.java |   8 +-
 .../apex/malhar/lib/logs/LineToTokenHashMap.java   |   8 +-
 .../apache/apex/malhar/lib/logs/LineTokenizer.java |   5 +-
 .../apex/malhar/lib/logs/LineTokenizerKeyVal.java  |   7 +-
 .../lib/logs/MultiWindowDimensionAggregation.java  |   4 +-
 .../malhar/lib/logs/RegexMatchMapOperator.java     |   2 +-
 .../apache/apex/malhar/lib/logs/package-info.java  |   2 +-
 .../malhar/lib/math/AbstractAggregateCalc.java     |   2 +-
 .../apex/malhar/lib/math/AbstractOutput.java       |   2 +-
 .../lib/math/AbstractXmlCartesianProduct.java      |   5 +-
 .../math/AbstractXmlKeyValueCartesianProduct.java  |   2 +-
 .../org/apache/apex/malhar/lib/math/Average.java   |   5 +-
 .../apache/apex/malhar/lib/math/AverageKeyVal.java |   6 +-
 .../org/apache/apex/malhar/lib/math/Division.java  |   2 +-
 .../apex/malhar/lib/math/LogicalCompare.java       |   2 +-
 .../malhar/lib/math/LogicalCompareToConstant.java  |   2 +-
 .../org/apache/apex/malhar/lib/math/Margin.java    |   5 +-
 .../apache/apex/malhar/lib/math/MarginKeyVal.java  |   6 +-
 .../org/apache/apex/malhar/lib/math/MarginMap.java |   6 +-
 .../java/org/apache/apex/malhar/lib/math/Max.java  |   5 +-
 .../org/apache/apex/malhar/lib/math/MaxKeyVal.java |   7 +-
 .../java/org/apache/apex/malhar/lib/math/Min.java  |   5 +-
 .../org/apache/apex/malhar/lib/math/MinKeyVal.java |   7 +-
 .../apex/malhar/lib/math/MultiplyByConstant.java   |   2 +-
 .../org/apache/apex/malhar/lib/math/Range.java     |   9 +-
 .../apache/apex/malhar/lib/math/RangeKeyVal.java   |  11 +-
 .../apex/malhar/lib/math/RunningAverage.java       |   2 +-
 .../org/apache/apex/malhar/lib/math/Sigma.java     |   2 +-
 .../lib/math/SingleVariableAbstractCalculus.java   |   2 +-
 .../apex/malhar/lib/math/SquareCalculus.java       |   2 +-
 .../java/org/apache/apex/malhar/lib/math/Sum.java  |   7 +-
 .../org/apache/apex/malhar/lib/math/SumKeyVal.java |   6 +-
 .../math/XmlKeyValueStringCartesianProduct.java    |   2 +-
 .../apache/apex/malhar/lib/math/package-info.java  |   2 +-
 .../apex/malhar/lib/metric/AvgAggregator.java      |   2 +-
 .../malhar/lib/metric/max/DoubleMaxAggregator.java |   2 +-
 .../malhar/lib/metric/max/FloatMaxAggregator.java  |   2 +-
 .../malhar/lib/metric/max/IntMaxAggregator.java    |   2 +-
 .../malhar/lib/metric/max/LongMaxAggregator.java   |   2 +-
 .../malhar/lib/metric/min/DoubleMinAggregator.java |   2 +-
 .../malhar/lib/metric/min/FloatMinAggregator.java  |   2 +-
 .../malhar/lib/metric/min/IntMinAggregator.java    |   2 +-
 .../malhar/lib/metric/min/LongMinAggregator.java   |   2 +-
 .../apex/malhar/lib/metric/package-info.java       |   2 +-
 .../lib/multiwindow/AbstractSlidingWindow.java     |   2 +-
 .../multiwindow/AbstractSlidingWindowKeyVal.java   |   7 +-
 .../lib/multiwindow/MultiWindowRangeKeyVal.java    |   8 +-
 .../lib/multiwindow/MultiWindowSumKeyVal.java      |   7 +-
 .../lib/multiwindow/SimpleMovingAverage.java       |   5 +-
 .../lib/multiwindow/SimpleMovingAverageObject.java |   2 +-
 .../malhar/lib/multiwindow/SortedMovingWindow.java |   2 +-
 .../apex/malhar/lib/multiwindow/package-info.java  |   2 +-
 .../org/apache/apex/malhar/lib/parser/Parser.java  |   4 +-
 .../apache/apex/malhar/lib/parser/XmlParser.java   |   5 +-
 .../apex/malhar/lib/parser/package-info.java       |   2 +-
 .../StatelessThroughputBasedPartitioner.java       |   2 +-
 .../StatsAwareStatelessPartitioner.java            |   2 +-
 .../apex/malhar/lib/partitioner/package-info.java  |   2 +-
 .../malhar/lib/projection/ProjectionOperator.java  |   5 +-
 .../apex/malhar/lib/script/JavaScriptOperator.java |   2 +-
 .../apex/malhar/lib/script/ScriptOperator.java     |   2 +-
 .../apex/malhar/lib/script/package-info.java       |   2 +-
 .../state/managed/AbstractManagedStateImpl.java    |   7 +-
 .../apex/malhar/lib/state/managed/Bucket.java      |   2 +-
 .../lib/state/managed/BucketsFileSystem.java       |   2 +-
 .../lib/state/managed/ManagedStateContext.java     |   3 +-
 .../state/managed/ManagedTimeStateMultiValue.java  |   2 +-
 .../state/managed/ManagedTimeUnifiedStateImpl.java |   2 +-
 .../apex/malhar/lib/statistics/MedianOperator.java |   2 +-
 .../apex/malhar/lib/statistics/ModeOperator.java   |   2 +-
 .../malhar/lib/statistics/StandardDeviation.java   |   2 +-
 .../lib/statistics/WeightedMeanOperator.java       |   6 +-
 .../apex/malhar/lib/statistics/package-info.java   |   2 +-
 .../apex/malhar/lib/stream/AbstractAggregator.java |   2 +-
 .../malhar/lib/stream/ArrayListAggregator.java     |   2 +-
 .../apex/malhar/lib/stream/ArrayListToItem.java    |   5 +-
 .../apex/malhar/lib/stream/ConsolidatorKeyVal.java |   5 +-
 .../org/apache/apex/malhar/lib/stream/Counter.java |   2 +-
 .../org/apache/apex/malhar/lib/stream/DevNull.java |   2 +-
 .../apex/malhar/lib/stream/DevNullCounter.java     |   2 +-
 .../malhar/lib/stream/HashMapToKeyValPair.java     |   7 +-
 .../malhar/lib/stream/JsonByteArrayOperator.java   |   2 +-
 .../malhar/lib/stream/KeyValPairToHashMap.java     |   7 +-
 .../apex/malhar/lib/stream/RoundRobinHashMap.java  |   5 +-
 .../apex/malhar/lib/stream/StreamDuplicater.java   |   5 +-
 .../apex/malhar/lib/stream/StreamMerger.java       |   2 +-
 .../apex/malhar/lib/stream/package-info.java       |   2 +-
 .../lib/streamquery/condition/Condition.java       |   2 +-
 .../condition/JoinColumnEqualCondition.java        |   2 +-
 .../malhar/lib/streamquery/index/ColumnIndex.java  |   2 +-
 .../apex/malhar/lib/streamquery/index/Index.java   |   2 +-
 .../malhar/lib/testbench/ArrayListTestSink.java    |   2 +-
 .../malhar/lib/testbench/CollectorTestSink.java    |   2 +-
 .../malhar/lib/testbench/CompareFilterTuples.java  |   2 +-
 .../lib/testbench/CountAndLastTupleTestSink.java   |   2 +-
 .../apex/malhar/lib/testbench/CountOccurance.java  |   2 +-
 .../apex/malhar/lib/testbench/CountTestSink.java   |   2 +-
 .../apex/malhar/lib/testbench/EventClassifier.java |   2 +-
 .../EventClassifierNumberToHashDouble.java         |   2 +-
 .../apex/malhar/lib/testbench/EventGenerator.java  |   2 +-
 .../malhar/lib/testbench/EventIncrementer.java     |   5 +-
 .../malhar/lib/testbench/FilterClassifier.java     |   2 +-
 .../lib/testbench/FilteredEventClassifier.java     |   2 +-
 .../apex/malhar/lib/testbench/HashTestSink.java    |   2 +-
 .../malhar/lib/testbench/HttpStatusFilter.java     |   2 +-
 .../apex/malhar/lib/testbench/KeyValSum.java       |   2 +-
 .../malhar/lib/testbench/RandomEventGenerator.java |   2 +-
 .../malhar/lib/testbench/RandomWordGenerator.java  |   2 +-
 .../apex/malhar/lib/testbench/RedisSumOper.java    |   2 +-
 .../malhar/lib/testbench/SeedEventClassifier.java  |   2 +-
 .../malhar/lib/testbench/SeedEventGenerator.java   |   5 +-
 .../apex/malhar/lib/testbench/SumTestSink.java     |   2 +-
 .../malhar/lib/testbench/ThroughputCounter.java    |   2 +-
 .../apex/malhar/lib/testbench/TopOccurrence.java   |   2 +-
 .../apex/malhar/lib/testbench/package-info.java    |   2 +-
 .../malhar/lib/transform/TransformOperator.java    |   6 +-
 .../malhar/lib/util/AbstractBaseFrequentKey.java   |   2 +-
 .../lib/util/AbstractBaseFrequentKeyValueMap.java  |   2 +-
 .../malhar/lib/util/AbstractBaseMatchOperator.java |   2 +-
 .../util/AbstractBaseNNonUniqueOperatorMap.java    |   2 +-
 .../malhar/lib/util/AbstractBaseNOperatorMap.java  |   2 +-
 .../lib/util/AbstractBaseNUniqueOperatorMap.java   |   2 +-
 .../malhar/lib/util/AbstractBaseSortOperator.java  |   2 +-
 .../util/AbstractDimensionTimeBucketOperator.java  |   2 +-
 .../lib/util/AbstractKeyValueStorageAgent.java     |   2 +-
 .../malhar/lib/util/ActiveMQMessageListener.java   |   2 +-
 .../lib/util/ActiveMQMultiTypeMessageListener.java |   2 +-
 .../apex/malhar/lib/util/ArrayHashMapFrequent.java |   2 +-
 .../lib/util/BaseFilteredKeyValueOperator.java     |   2 +-
 .../apex/malhar/lib/util/BaseKeyOperator.java      |   2 +-
 .../apex/malhar/lib/util/BaseKeyValueOperator.java |   5 +-
 .../apex/malhar/lib/util/BaseLineTokenizer.java    |   2 +-
 .../apex/malhar/lib/util/BaseMatchOperator.java    |   2 +-
 .../lib/util/BaseNumberKeyValueOperator.java       |   2 +-
 .../malhar/lib/util/BaseNumberValueOperator.java   |   2 +-
 .../apex/malhar/lib/util/BaseUniqueKeyCounter.java |   2 +-
 .../malhar/lib/util/BaseUniqueKeyValueCounter.java |   2 +-
 .../lib/util/DimensionTimeBucketSumOperator.java   |   2 +-
 .../org/apache/apex/malhar/lib/util/FieldInfo.java |   2 +-
 .../apex/malhar/lib/util/FieldValueGenerator.java  |   6 +-
 .../apex/malhar/lib/util/FilterOperator.java       |   2 +-
 .../org/apache/apex/malhar/lib/util/HighLow.java   |   2 +-
 .../malhar/lib/util/JavaScriptFilterOperator.java  |   2 +-
 .../apex/malhar/lib/util/KeyHashValPair.java       |   2 +-
 .../apache/apex/malhar/lib/util/KeyValPair.java    |   2 +-
 .../apex/malhar/lib/util/KryoCloneUtils.java       |   2 +-
 .../org/apache/apex/malhar/lib/util/PojoUtils.java |   9 +-
 .../apex/malhar/lib/util/ReusableStringReader.java |   2 +-
 .../apex/malhar/lib/util/ReversibleComparator.java |   2 +-
 .../malhar/lib/util/StorageAgentKeyValueStore.java |   4 +-
 .../org/apache/apex/malhar/lib/util/TableInfo.java |   2 +-
 .../apache/apex/malhar/lib/util/TimeBucketKey.java |   2 +-
 .../org/apache/apex/malhar/lib/util/TopNSort.java  |   2 +-
 .../apex/malhar/lib/util/TopNUniqueSort.java       |   2 +-
 .../lib/util/UnifierArrayHashMapFrequent.java      |   2 +-
 .../apex/malhar/lib/util/UnifierArrayList.java     |   2 +-
 .../apex/malhar/lib/util/UnifierBooleanAnd.java    |   2 +-
 .../apex/malhar/lib/util/UnifierBooleanOr.java     |   2 +-
 .../apex/malhar/lib/util/UnifierCountOccurKey.java |   2 +-
 .../apex/malhar/lib/util/UnifierHashMap.java       |   2 +-
 .../malhar/lib/util/UnifierHashMapFrequent.java    |   2 +-
 .../malhar/lib/util/UnifierHashMapInteger.java     |   2 +-
 .../apex/malhar/lib/util/UnifierHashMapRange.java  |   2 +-
 .../malhar/lib/util/UnifierHashMapSumKeys.java     |   2 +-
 .../apex/malhar/lib/util/UnifierKeyValRange.java   |   2 +-
 .../apache/apex/malhar/lib/util/UnifierMap.java    |   2 +-
 .../apache/apex/malhar/lib/util/UnifierRange.java  |   2 +-
 .../apex/malhar/lib/util/UnifierSumNumber.java     |   2 +-
 .../lib/util/comparator/SliceComparator.java       |   2 +-
 .../apache/apex/malhar/lib/util/package-info.java  |   2 +-
 .../apex/malhar/lib/util/time/WindowUtils.java     |   2 +-
 .../apex/malhar/lib/wal/FSWindowDataManager.java   |   4 +-
 .../apex/malhar/lib/wal/WindowDataManager.java     |   3 +-
 .../lib/window/accumulation/AbstractPojoJoin.java  |   5 +-
 .../lib/window/accumulation/PojoFullOuterJoin.java |   5 +-
 .../lib/window/accumulation/PojoInnerJoin.java     |   6 +-
 .../lib/window/accumulation/PojoLeftOuterJoin.java |   5 +-
 .../window/accumulation/PojoRightOuterJoin.java    |   5 +-
 .../malhar/lib/window/accumulation/TopNByKey.java  |   2 +-
 .../impl/KeyedWindowedMergeOperatorImpl.java       |   2 +-
 .../lib/window/impl/KeyedWindowedOperatorImpl.java |   2 +-
 .../window/impl/WindowedMergeOperatorFeatures.java |   3 +-
 .../malhar/lib/xml/AbstractXmlDOMOperator.java     |   2 +-
 .../org/apache/hadoop/io/file/tfile/DTFile.java    |   7 +-
 .../apex/malhar/lib/algo/BottomNMapTest.java       |   6 +-
 .../apex/malhar/lib/algo/BottomNUnifierTest.java   |   4 +-
 .../apex/malhar/lib/algo/BottomNUniqueMapTest.java |   6 +-
 .../malhar/lib/algo/CompareExceptCountMapTest.java |   6 +-
 .../apache/apex/malhar/lib/algo/DistinctTest.java  |   8 +-
 .../apex/malhar/lib/algo/FilterValuesTest.java     |   6 +-
 .../apex/malhar/lib/algo/InsertSortTest.java       |   6 +-
 .../apex/malhar/lib/algo/LeastFrequentKeyTest.java |   6 +-
 .../apex/malhar/lib/algo/MatchAllMapTest.java      |   6 +-
 .../apex/malhar/lib/algo/MatchAnyMapTest.java      |   6 +-
 .../apex/malhar/lib/algo/MergeSortNumberTest.java  |   6 +-
 .../apex/malhar/lib/algo/MostFrequentKeyTest.java  |   6 +-
 .../org/apache/apex/malhar/lib/algo/TopNTest.java  |   6 +-
 .../apex/malhar/lib/algo/TopNUniqueTest.java       |   6 +-
 .../apex/malhar/lib/algo/UniqueCounterTest.java    |   6 +-
 .../apex/malhar/lib/algo/UniqueValueCountTest.java |  12 +-
 .../apex/malhar/lib/appdata/ThreadUtils.java       |   2 +-
 .../datastructs/CacheLRUSynchronousFlushTest.java  |   6 +-
 .../appdata/datastructs/DimensionalTableTest.java  |   6 +-
 .../dimensions/CustomTimeBucketRegistryTest.java   |   7 +-
 .../appdata/dimensions/DimensionsEventTest.java    |   9 +-
 .../malhar/lib/appdata/gpo/GPOMutableTest.java     |   8 +-
 .../apex/malhar/lib/appdata/gpo/GPOUtilsTest.java  |   9 +-
 .../lib/appdata/gpo/SerdeFieldsDescriptorTest.java |   7 +-
 .../lib/appdata/gpo/SerdeListGPOMutableTest.java   |   7 +-
 .../lib/appdata/gpo/SerdeListPrimitiveTest.java    |   2 +-
 .../lib/appdata/gpo/SerdeListStringTest.java       |   2 +-
 .../apex/malhar/lib/appdata/query/MockQuery.java   |   4 +-
 .../apex/malhar/lib/appdata/query/MockResult.java  |  10 +-
 .../lib/appdata/query/MockResultSerializer.java    |  10 +-
 .../query/QueryManagerAsynchronousTest.java        |  10 +-
 .../appdata/query/QueryManagerSynchronousTest.java |   8 +-
 .../malhar/lib/appdata/query/QueueUtilsTest.java   |   6 +-
 .../query/SimpleDoneQueryQueueManagerTest.java     |   7 +-
 .../appdata/query/SimpleQueryQueueManagerTest.java |   4 +-
 .../lib/appdata/query/WEQueryQueueManagerTest.java |   5 +-
 .../appdata/query/WindowBoundedServiceTest.java    |   4 +-
 .../serde/MessageDeserializerFactoryTest.java      |   6 +-
 .../query/serde/SimpleDataValidatorTest.java       |   4 +-
 .../lib/appdata/schemas/CustomTimeBucketTest.java  |   2 +-
 .../schemas/DataQuerySnapshotDeserializerTest.java |   8 +-
 .../lib/appdata/schemas/DataQuerySnapshotTest.java |   2 +-
 .../schemas/DataResultSnapshotSerializerTest.java  |   8 +-
 .../DimensionalConfigurationSchemaTest.java        |   9 +-
 .../lib/appdata/schemas/DimensionalSchemaTest.java |   5 +-
 .../lib/appdata/schemas/FieldsDescriptorTest.java  |   2 +-
 .../lib/appdata/schemas/ResultFormatterTest.java   |   4 +-
 .../lib/appdata/schemas/SchemaQueryTest.java       |   6 +-
 .../schemas/SchemaRegistryMultipleTest.java        |   6 +-
 .../appdata/schemas/SchemaRegistrySingleTest.java  |   4 +-
 .../lib/appdata/schemas/SchemaTestUtils.java       |   2 +-
 .../lib/appdata/schemas/SchemaUtilsTest.java       |   2 +-
 .../lib/appdata/schemas/SnapshotSchemaTest.java    |   2 +-
 .../malhar/lib/appdata/schemas/TimeBucketTest.java |   4 +-
 .../snapshot/AppDataSnapshotServerMapTest.java     |   8 +-
 .../snapshot/AppDataSnapshotServerPojoTest.java    |  14 +-
 .../AppDataSnapshotServerTagsSupportTest.java      |  12 +-
 .../malhar/lib/bandwidth/BandwidthManagerTest.java |   5 +-
 .../lib/bandwidth/BandwidthPartitionerTest.java    |   2 +-
 .../codec/JavaSerializationStreamCodecTest.java    |   4 +-
 .../apex/malhar/lib/codec/KryoStreamCodecTest.java |   2 +-
 .../converter/ByteArrayToStringConverterTest.java  |   6 +-
 .../converter/MapToKeyValuePairConverterTest.java  |   8 +-
 .../StringValueToNumberConverterForMapTest.java    |   6 +-
 .../malhar/lib/counters/BasicCountersTest.java     |   2 +-
 .../malhar/lib/db/KeyValueStoreOperatorTest.java   |   4 +-
 .../TransactionableKeyValueStoreOperatorTest.java  |   4 +-
 .../apex/malhar/lib/db/cache/CacheManagerTest.java |   2 +-
 .../apex/malhar/lib/db/cache/CacheStoreTest.java   |   3 +-
 .../db/jdbc/JDBCLookupCacheBackedOperatorTest.java |   7 +-
 .../apache/apex/malhar/lib/db/jdbc/JdbcIOApp.java  |   6 +-
 .../apex/malhar/lib/db/jdbc/JdbcIOAppTest.java     |   2 +-
 .../db/jdbc/JdbcInputOperatorApplicationTest.java  |   4 +-
 ...dbcNonTransactionalBatchOutputOperatorTest.java |  17 +-
 .../JdbcNonTransactionalOutputOperatorTest.java    |   4 +-
 .../lib/db/jdbc/JdbcNonTransactionalStoreTest.java |   2 +-
 .../apex/malhar/lib/db/jdbc/JdbcOperatorTest.java  |   2 +-
 .../db/jdbc/JdbcPojoOperatorApplicationTest.java   |   2 +-
 .../malhar/lib/db/jdbc/JdbcPojoOperatorTest.java   |  16 +-
 .../lib/db/jdbc/JdbcPojoPollableOpeartorTest.java  |  14 +-
 .../apex/malhar/lib/db/jdbc/JdbcStoreTest.java     |   2 +-
 .../RedshiftJdbcTransactionalOperatorTest.java     |   4 +-
 .../lib/dedup/DeduperBoundedPOJOImplTest.java      |   8 +-
 .../apex/malhar/lib/dedup/DeduperOrderingTest.java |   4 +-
 .../malhar/lib/dedup/DeduperPartitioningTest.java  |   2 +-
 .../lib/dedup/DeduperTimeBasedPOJOImplTest.java    |  12 +-
 .../dimensions/CustomTimeBucketRegistryTest.java   |   4 +-
 .../lib/dimensions/DimensionsDescriptorTest.java   |  10 +-
 .../apex/malhar/lib/filter/FilterAppTest.java      |   5 +-
 .../apache/apex/malhar/lib/filter/FilterTest.java  |   5 +-
 .../malhar/lib/formatter/JsonFormatterTest.java    |  13 +-
 .../malhar/lib/formatter/XmlFormatterTest.java     |   8 +-
 .../lib/fs/FSRecordCompactionOperatorTest.java     |   4 +-
 .../lib/fs/GenericFileOutputOperatorTest.java      |   2 +-
 .../lib/fs/s3/S3DelimitedRecordReaderTest.java     |   9 +-
 .../lib/fs/s3/S3FixedWidthRecordReaderTest.java    |   9 +-
 .../fs/s3/S3InitiateFileUploadOperatorTest.java    |   8 +-
 .../malhar/lib/fs/s3/S3OutputModuleMockTest.java   |   4 +-
 .../apex/malhar/lib/fs/s3/S3ReconcilerTest.java    |   4 +-
 .../malhar/lib/fs/s3/S3RecordReaderMockTest.java   |   6 +-
 .../lib/helper/OperatorContextTestHelper.java      |   2 +-
 .../lib/helper/SamplePubSubWebSocketServlet.java   |   2 +-
 .../apex/malhar/lib/helper/TestPortContext.java    |   2 +-
 .../apex/malhar/lib/io/ApacheRandomLogsTest.java   |   4 +-
 .../malhar/lib/io/FTPStringInputOperatorTest.java  |  10 +-
 .../apex/malhar/lib/io/HttpGetMapOperatorTest.java |   6 +-
 .../lib/io/HttpJsonChunksInputOperatorTest.java    |   5 +-
 .../malhar/lib/io/HttpLinesInputOperatorTest.java  |   7 +-
 .../lib/io/HttpMultiValuedMapGetOperatorTest.java  |   8 +-
 .../malhar/lib/io/HttpPostOutputOperatorTest.java  |   4 +-
 .../lib/io/IdempotentStorageManagerTest.java       |   4 +-
 .../lib/io/PubSubWebSocketAppDataOperatorTest.java |   2 +-
 .../lib/io/PubSubWebSocketAppDataQueryTest.java    |   4 +-
 .../lib/io/PubSubWebSocketAppDataResultTest.java   |   2 +-
 .../malhar/lib/io/PubSubWebSocketOperatorTest.java |   9 +-
 .../apex/malhar/lib/io/SmtpOutputOperatorTest.java |   2 +-
 .../malhar/lib/io/SocketInputOperatorTest.java     |   6 +-
 .../lib/io/WebSocketServerInputOperatorTest.java   |   2 +-
 .../lib/io/block/AbstractBlockReaderTest.java      |   6 +-
 .../apex/malhar/lib/io/block/FSLineReaderTest.java |   7 +-
 .../malhar/lib/io/block/FSSliceReaderTest.java     |   6 +-
 .../malhar/lib/io/block/PartFileWriterTest.java    |   5 +-
 .../lib/io/block/ReadAheadLineReaderTest.java      |   2 +-
 ...stractFileInputOperatorFailureHandlingTest.java |  10 +-
 .../lib/io/fs/AbstractFileInputOperatorTest.java   |  15 +-
 .../lib/io/fs/AbstractFileOutputOperatorTest.java  |  10 +-
 .../malhar/lib/io/fs/AbstractReconcilerTest.java   |   6 +-
 .../fs/AbstractSingleFileOutputOperatorTest.java   |   8 +-
 .../AbstractThroughputFileInputOperatorTest.java   |   8 +-
 .../fs/AbstractWindowFileOutputOperatorTest.java   |   9 +-
 .../apex/malhar/lib/io/fs/BlockWriterTest.java     |   8 +-
 .../malhar/lib/io/fs/FSInputModuleAppTest.java     |  11 +-
 .../apex/malhar/lib/io/fs/FSInputModuleTest.java   |   6 +-
 .../lib/io/fs/FastMergerDecisionMakerTest.java     |   9 +-
 .../apex/malhar/lib/io/fs/FileMergerTest.java      |  18 +-
 .../malhar/lib/io/fs/FileSplitterBaseTest.java     |  10 +-
 .../malhar/lib/io/fs/FileSplitterInputTest.java    |  12 +-
 .../apex/malhar/lib/io/fs/FileSplitterTest.java    |  10 +-
 .../apex/malhar/lib/io/fs/FileStitcherTest.java    |  18 +-
 .../malhar/lib/io/fs/S3InputModuleAppTest.java     |   8 +-
 .../apex/malhar/lib/io/fs/SynchronizerTest.java    |  12 +-
 .../malhar/lib/io/fs/TailFsInputOperatorTest.java  |   6 +-
 .../io/jms/FSPsuedoTransactionableStoreTest.java   |   2 +-
 .../lib/io/jms/JMSMultiPortOutputOperatorTest.java |   9 +-
 .../lib/io/jms/JMSObjectInputOperatorTest.java     |   7 +-
 .../malhar/lib/io/jms/JMSOutputOperatorTest.java   |   6 +-
 .../lib/io/jms/JMSStringInputOperatorTest.java     |   6 +-
 .../apache/apex/malhar/lib/io/jms/JMSTestBase.java |   2 +-
 .../lib/io/jms/JMSTransactionableStoreTest.java    |   2 +-
 .../io/jms/JMSTransactionableStoreTestBase.java    |  11 +-
 .../lib/io/jms/SQSStringInputOperatorTest.java     |  10 +-
 .../apache/apex/malhar/lib/io/jms/SQSTestBase.java |   2 +-
 .../apex/malhar/lib/join/AntiJoinOperatorTest.java |  12 +-
 .../malhar/lib/join/MapTimeBasedJoinOperator.java  |   9 +-
 .../malhar/lib/join/POJOInnerJoinOperatorTest.java |   8 +-
 .../lib/join/POJOPartitionJoinOperatorTest.java    |   2 +-
 .../lib/join/POJOTimeBasedJoinOperatorTest.java    |   8 +-
 .../apex/malhar/lib/join/SemiJoinOperatorTest.java |  12 +-
 .../logs/ApacheLogParseMapOutputOperatorTest.java  |   6 +-
 .../lib/logs/ApacheLogParseOperatorTest.java       |   6 +-
 .../lib/logs/FilteredLineToTokenArrayListTest.java |   6 +-
 .../lib/logs/FilteredLineToTokenHashMapTest.java   |   6 +-
 .../lib/logs/FilteredLineTokenizerKeyValTest.java  |   6 +-
 .../malhar/lib/logs/LineToTokenArrayListTest.java  |   6 +-
 .../malhar/lib/logs/LineToTokenHashMapTest.java    |   6 +-
 .../malhar/lib/logs/LineTokenizerKeyValTest.java   |   6 +-
 .../apex/malhar/lib/logs/LineTokenizerTest.java    |   6 +-
 .../logs/MultiWindowDimensionAggregationTest.java  |   7 +-
 .../malhar/lib/logs/RegexMatchMapOperatorTest.java |   6 +-
 .../malhar/lib/logs/TopNUniqueSiteStatsTest.java   |   7 +-
 .../apex/malhar/lib/math/AverageKeyValTest.java    |   8 +-
 .../apache/apex/malhar/lib/math/AverageTest.java   |   8 +-
 .../apex/malhar/lib/math/CountOccuranceTest.java   |   6 +-
 .../apache/apex/malhar/lib/math/DivisionTest.java  |   6 +-
 .../apex/malhar/lib/math/LogicalCompareTest.java   |   7 +-
 .../lib/math/LogicalCompareToConstantTest.java     |   6 +-
 .../apex/malhar/lib/math/MarginKeyValTest.java     |   8 +-
 .../apache/apex/malhar/lib/math/MarginMapTest.java |   6 +-
 .../apache/apex/malhar/lib/math/MarginTest.java    |   6 +-
 .../apache/apex/malhar/lib/math/MaxKeyValTest.java |   9 +-
 .../org/apache/apex/malhar/lib/math/MaxTest.java   |   6 +-
 .../apache/apex/malhar/lib/math/MinKeyValTest.java |   9 +-
 .../org/apache/apex/malhar/lib/math/MinTest.java   |   6 +-
 .../malhar/lib/math/MultiplyByConstantTest.java    |   6 +-
 .../apex/malhar/lib/math/RangeKeyValTest.java      |  10 +-
 .../org/apache/apex/malhar/lib/math/RangeTest.java |   8 +-
 .../apex/malhar/lib/math/RunningAverageTest.java   |   4 +-
 .../org/apache/apex/malhar/lib/math/SigmaTest.java |   6 +-
 .../apex/malhar/lib/math/SquareCalculusTest.java   |   6 +-
 .../apache/apex/malhar/lib/math/SumKeyValTest.java |   8 +-
 .../org/apache/apex/malhar/lib/math/SumTest.java   |   6 +-
 .../XmlKeyValueStringCartesianProductTest.java     |   2 +-
 .../multiwindow/MultiWindowRangeKeyValTest.java    |   8 +-
 .../lib/multiwindow/MultiWindowSumKeyValTest.java  |   8 +-
 .../lib/multiwindow/SimpleMovingAverageTest.java   |   8 +-
 .../malhar/lib/multiwindow/SlidingWindowTest.java  |   8 +-
 .../lib/multiwindow/SortedMovingWindowTest.java    |   5 +-
 .../lib/parser/XmlParserApplicationTest.java       |  12 +-
 .../apex/malhar/lib/parser/XmlParserTest.java      |   8 +-
 .../lib/partitioner/StatelessPartitionerTest.java  |   5 +-
 .../StatelessThroughputBasedPartitionerTest.java   |   5 +-
 .../apex/malhar/lib/projection/ActivateTest.java   |   2 +-
 .../apex/malhar/lib/projection/ProjectionTest.java |   4 +-
 .../malhar/lib/script/JavaScriptOperatorTest.java  |   8 +-
 .../lib/state/managed/BucketsFileSystemTest.java   |   5 +-
 .../lib/state/managed/DefaultBucketTest.java       |   6 +-
 .../managed/IncrementalCheckpointManagerTest.java  |   6 +-
 .../lib/state/managed/ManagedStateImplTest.java    |   7 +-
 .../lib/state/managed/ManagedStateTestUtils.java   |   6 +-
 .../state/managed/ManagedTimeStateImplTest.java    |   8 +-
 .../managed/ManagedTimeUnifiedStateImplTest.java   |   4 +-
 .../lib/state/managed/MockManagedStateContext.java |   7 +-
 .../MovingBoundaryTimeBucketAssignerTest.java      |   3 +-
 .../malhar/lib/state/managed/StateTrackerTest.java |   5 +-
 ...SequentialSpillableIdentifierGeneratorTest.java |   2 +-
 .../spillable/SpillableArrayListImplTest.java      |   7 +-
 .../SpillableArrayListMultimapImplTest.java        |   4 +-
 .../lib/state/spillable/SpillableMapImplTest.java  |   4 +-
 .../spillable/SpillableSetMultimapImplTest.java    |   7 +-
 .../lib/state/spillable/SpillableTestUtils.java    |   4 +-
 .../inmem/InMemorySpillableStateStoreTest.java     |   2 +-
 .../lib/statistics/MeridianOperatorTest.java       |   8 +-
 .../malhar/lib/statistics/ModeOperatorTest.java    |   8 +-
 .../statistics/StandardDeviationOperatorTest.java  |   6 +-
 .../lib/statistics/WeightedMeanOperatorTest.java   |   8 +-
 .../malhar/lib/stream/ArrayListAggregatorTest.java |   6 +-
 .../malhar/lib/stream/ArrayListToItemTest.java     |   6 +-
 .../malhar/lib/stream/ConsolidatorKeyValTest.java  |   8 +-
 .../apache/apex/malhar/lib/stream/CounterTest.java |   6 +-
 .../apex/malhar/lib/stream/DevNullCounterTest.java |   6 +-
 .../apache/apex/malhar/lib/stream/DevNullTest.java |   6 +-
 .../malhar/lib/stream/HashMapToKeyValPairTest.java |   6 +-
 .../lib/stream/JsonByteArrayOperatorTest.java      |   4 +-
 .../malhar/lib/stream/KeyPairToHashMapTest.java    |   8 +-
 .../malhar/lib/stream/RoundRobinHashMapTest.java   |   6 +-
 .../malhar/lib/stream/StreamDuplicaterTest.java    |   6 +-
 .../apex/malhar/lib/stream/StreamMergerTest.java   |   6 +-
 .../lib/testbench/ActiveMQMessageGenerator.java    |   2 +-
 .../malhar/lib/testbench/EventClassifierTest.java  |   4 +-
 .../malhar/lib/testbench/EventGeneratorTest.java   |   4 +-
 .../malhar/lib/testbench/EventIncrementerTest.java |   4 +-
 .../lib/testbench/FilteredEventClassifierTest.java |   4 +-
 .../lib/testbench/RandomEventGeneratorTest.java    |   4 +-
 .../lib/testbench/RandomWordGeneratorTest.java     |   2 +-
 .../lib/testbench/SeedEventClassifierTest.java     |   4 +-
 .../lib/testbench/SeedEventGeneratorTest.java      |   4 +-
 .../lib/testbench/ThroughputCounterTest.java       |   4 +-
 .../lib/transform/TransformOperatorAppTest.java    |   5 +-
 .../lib/transform/TransformOperatorTest.java       |   7 +-
 .../util/DimensionTimeBucketSumOperatorTest.java   |   5 +-
 .../lib/util/JavaScriptFilterOperatorTest.java     |   6 +-
 .../apex/malhar/lib/util/KryoCloneUtilsTest.java   |   2 +-
 .../apache/apex/malhar/lib/util/PojoUtilsTest.java |  78 +++---
 .../apex/malhar/lib/util/TestObjAllTypes.java      |   2 +-
 .../org/apache/apex/malhar/lib/util/TestUtils.java |   2 +-
 .../apex/malhar/lib/util/time/WindowUtilsTest.java |   4 +-
 .../malhar/lib/wal/FSWindowDataManagerTest.java    |   5 +-
 .../apex/malhar/lib/wal/FileSystemWALTest.java     |   2 +-
 .../lib/window/SpillableWindowedStorageTest.java   |   2 +-
 .../malhar/lib/window/WindowedOperatorTest.java    |   4 +-
 .../lib/window/accumulation/PojoInnerJoinTest.java |   4 +-
 .../lib/window/accumulation/PojoOuterJoinTest.java |   4 +-
 .../lib/window/accumulation/TopNByKeyTest.java     |   2 +-
 .../KeyedWindowedMergeOperatorTestApplication.java |   4 +-
 .../lib/window/impl/WindowedMergeOperatorTest.java |   5 +-
 .../impl/WindowedMergeOperatorTestApplication.java |   2 +-
 .../malhar/lib/window/sample/pi/Application.java   |   2 +-
 .../lib/window/sample/wordcount/Application.java   |   4 +-
 pom.xml                                            |   4 +-
 samples/pom.xml                                    |  55 -----
 .../samples/lib/algo/AllAfterMatchMapSample.java   |  65 -----
 .../samples/lib/algo/BottomNMapSample.java         |  65 -----
 .../datatorrent/samples/lib/algo/package-info.java |  25 --
 .../samples/lib/io/HttpInputOperatorSample.java    |  64 -----
 .../datatorrent/samples/lib/io/package-info.java   |  24 --
 .../samples/lib/math/AverageKeyValSample.java      |  64 -----
 .../samples/lib/math/AverageSample.java            |  70 ------
 .../datatorrent/samples/lib/math/ChangeSample.java |  70 ------
 .../samples/lib/math/CompreMapSample.java          |  61 -----
 .../samples/lib/math/CountKeyValSample.java        |  62 -----
 .../samples/lib/math/CountKeyValues.java           |  88 -------
 .../samples/lib/math/LogicalCompareSample.java     |  62 -----
 .../samples/lib/math/PartitionMathSumSample.java   |  71 ------
 .../lib/math/RandomEvenetGeneratorSample.java      |  57 -----
 .../samples/lib/math/RandomKeyValMap.java          |  84 -------
 .../samples/lib/math/RandomKeyValues.java          |  84 -------
 .../samples/lib/math/RandomPairIntegers.java       |  84 -------
 .../datatorrent/samples/lib/math/ScriptSample.java |  61 -----
 .../samples/lib/math/SingleKeyValMap.java          |  82 -------
 .../datatorrent/samples/lib/math/package-info.java |  25 --
 .../java/com/datatorrent/samples/package-info.java |  25 --
 .../lib/math/PartitionMathSumSampleTest.java       |  44 ----
 samples/src/test/resources/log4j.properties        |  43 ----
 sql/pom.xml                                        |   2 +-
 .../malhar/sql/codegen/ExpressionCompiler.java     |   2 +-
 .../sql/operators/FilterTransformOperator.java     |   6 +-
 .../apex/malhar/sql/operators/LineReader.java      |   2 +-
 .../apex/malhar/sql/planner/ApexRelNode.java       |   2 +-
 .../apex/malhar/sql/table/CSVMessageFormat.java    |   6 +-
 .../apache/apex/malhar/sql/KafkaEndpointTest.java  |   4 +-
 .../java/org/apache/apex/malhar/sql/SerDeTest.java |   4 +-
 .../apache/apex/malhar/sql/StreamEndpointTest.java |   4 +-
 stream/pom.xml                                     |   2 +-
 .../apex/malhar/stream/api/WindowedStream.java     |   3 +-
 .../malhar/stream/api/impl/ApexStreamImpl.java     |   2 +-
 .../stream/api/impl/ApexWindowedStreamImpl.java    |   3 +-
 .../apex/malhar/stream/api/impl/StreamFactory.java |   2 +-
 .../stream/sample/ApplicationWithStreamAPI.java    |   2 +-
 .../sample/LocalTestWithoutStreamApplication.java  |   3 +-
 .../apex/malhar/stream/sample/MyStreamTest.java    |   3 +-
 .../stream/sample/WordCountWithStreamAPI.java      |   2 +-
 1576 files changed, 6492 insertions(+), 7802 deletions(-)

diff --git a/apps/filecopy/pom.xml b/apps/filecopy/pom.xml
index d6a0ccd..69b2e95 100644
--- a/apps/filecopy/pom.xml
+++ b/apps/filecopy/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>malhar-apps</artifactId>
     <groupId>org.apache.apex</groupId>
-    <version>3.9.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>filecopy</artifactId>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.apex</groupId>
       <artifactId>malhar-library</artifactId>
-      <version>3.9.0-SNAPSHOT</version>
+      <version>4.0.0-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
diff --git a/apps/filecopy/src/main/java/com/datatorrent/apps/copy/HDFSFileCopyApp.java b/apps/filecopy/src/main/java/com/datatorrent/apps/copy/HDFSFileCopyApp.java
index 2688f1c..bb1e1d9 100644
--- a/apps/filecopy/src/main/java/com/datatorrent/apps/copy/HDFSFileCopyApp.java
+++ b/apps/filecopy/src/main/java/com/datatorrent/apps/copy/HDFSFileCopyApp.java
@@ -19,14 +19,14 @@
 
 package com.datatorrent.apps.copy;
 
+import org.apache.apex.malhar.lib.io.fs.FSInputModule;
+import org.apache.apex.malhar.lib.io.fs.HDFSFileCopyModule;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.io.fs.FSInputModule;
-import com.datatorrent.lib.io.fs.HDFSFileCopyModule;
 
 /**
  * Application for HDFS to HDFS file copy
diff --git a/apps/logstream/pom.xml b/apps/logstream/pom.xml
index 07a5eee..13cc865 100644
--- a/apps/logstream/pom.xml
+++ b/apps/logstream/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>malhar-apps</artifactId>
     <groupId>org.apache.apex</groupId>
-    <version>3.9.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.apex</groupId>
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/AggregationsToRedisOperator.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/AggregationsToRedisOperator.java
index 495987e..74997f4 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/AggregationsToRedisOperator.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/AggregationsToRedisOperator.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.datatorrent.lib.logs.DimensionObject;
-import com.datatorrent.lib.util.KeyValPair;
+import org.apache.apex.malhar.lib.logs.DimensionObject;
+import org.apache.apex.malhar.lib.util.KeyValPair;
 
 import com.datatorrent.common.util.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java
index 82c9214..e3858b4 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application.java
@@ -28,25 +28,26 @@ import java.util.Set;
 import org.apache.apex.malhar.contrib.misc.streamquery.SelectOperator;
 import org.apache.apex.malhar.contrib.misc.streamquery.condition.EqualValueCondition;
 import org.apache.apex.malhar.lib.utils.PubSubHelper;
+import org.apache.apex.malhar.contrib.redis.RedisKeyValPairOutputOperator;
+import org.apache.apex.malhar.contrib.redis.RedisMapOutputOperator;
+import org.apache.apex.malhar.contrib.redis.RedisNumberSummationMapOutputOperator;
+import org.apache.apex.malhar.lib.algo.TopN;
+import org.apache.apex.malhar.lib.io.ConsoleOutputOperator;
+import org.apache.apex.malhar.lib.io.PubSubWebSocketOutputOperator;
+import org.apache.apex.malhar.lib.logs.DimensionObject;
+import org.apache.apex.malhar.lib.logs.MultiWindowDimensionAggregation;
+import org.apache.apex.malhar.lib.logs.MultiWindowDimensionAggregation.AggregateOperation;
+import org.apache.apex.malhar.lib.stream.Counter;
+import org.apache.apex.malhar.lib.stream.JsonByteArrayOperator;
+import org.apache.apex.malhar.lib.streamquery.index.ColumnIndex;
+import org.apache.apex.malhar.lib.util.AbstractDimensionTimeBucketOperator;
+import org.apache.apex.malhar.lib.util.DimensionTimeBucketSumOperator;
+import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.Operator.InputPort;
 import com.datatorrent.api.StreamingApplication;
-import com.datatorrent.contrib.redis.RedisKeyValPairOutputOperator;
-import com.datatorrent.contrib.redis.RedisMapOutputOperator;
-import com.datatorrent.contrib.redis.RedisNumberSummationMapOutputOperator;
-import com.datatorrent.lib.algo.TopN;
-import com.datatorrent.lib.io.ConsoleOutputOperator;
-import com.datatorrent.lib.io.PubSubWebSocketOutputOperator;
-import com.datatorrent.lib.logs.DimensionObject;
-import com.datatorrent.lib.logs.MultiWindowDimensionAggregation;
-import com.datatorrent.lib.logs.MultiWindowDimensionAggregation.AggregateOperation;
-import com.datatorrent.lib.stream.Counter;
-import com.datatorrent.lib.stream.JsonByteArrayOperator;
-import com.datatorrent.lib.streamquery.index.ColumnIndex;
-import com.datatorrent.lib.util.AbstractDimensionTimeBucketOperator;
-import com.datatorrent.lib.util.DimensionTimeBucketSumOperator;
 
 /**
  * Log stream processing application based on Apex platform.<br>
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application1.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application1.java
index 333b877..a458b3c 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application1.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/Application1.java
@@ -18,11 +18,10 @@
  */
 package com.datatorrent.apps.logstream;
 
+import org.apache.apex.malhar.lib.io.ConsoleOutputOperator;
+import org.apache.apex.malhar.lib.stream.JsonByteArrayOperator;
 import org.apache.hadoop.conf.Configuration;
 
-import com.datatorrent.lib.io.ConsoleOutputOperator;
-import com.datatorrent.lib.stream.JsonByteArrayOperator;
-
 import com.datatorrent.api.Context.PortContext;
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.StreamingApplication;
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperator.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperator.java
index 2650795..de96781 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperator.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperator.java
@@ -28,10 +28,11 @@ import com.google.common.collect.Sets;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import org.apache.apex.malhar.lib.codec.KryoSerializableStreamCodec;
+import org.apache.apex.malhar.lib.logs.DimensionObject;
 import org.apache.commons.lang.mutable.MutableDouble;
 
-import com.datatorrent.lib.codec.KryoSerializableStreamCodec;
-import com.datatorrent.lib.logs.DimensionObject;
 import com.datatorrent.api.*;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.Partitioner.PartitioningContext;
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperatorUnifier.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperatorUnifier.java
index e495ee6..606edb7 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperatorUnifier.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/DimensionOperatorUnifier.java
@@ -26,10 +26,9 @@ import java.util.Map.Entry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.logs.DimensionObject;
 import org.apache.commons.lang.mutable.MutableDouble;
 
-import com.datatorrent.lib.logs.DimensionObject;
-
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.Operator.Unifier;
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogScoreOperator.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogScoreOperator.java
index 57c558b..74dc3a6 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogScoreOperator.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogScoreOperator.java
@@ -20,10 +20,12 @@ package com.datatorrent.apps.logstream;
 
 import com.datatorrent.common.util.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
-import com.datatorrent.lib.logs.DimensionObject;
+
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.apex.malhar.lib.logs.DimensionObject;
+
 /**
  * Log Score
  *
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamTopN.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamTopN.java
index a09e64f..8df62fa 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamTopN.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamTopN.java
@@ -28,9 +28,9 @@ import com.google.common.collect.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.datatorrent.lib.algo.TopN;
-import com.datatorrent.lib.codec.KryoSerializableStreamCodec;
-import com.datatorrent.lib.logs.DimensionObject;
+import org.apache.apex.malhar.lib.algo.TopN;
+import org.apache.apex.malhar.lib.codec.KryoSerializableStreamCodec;
+import org.apache.apex.malhar.lib.logs.DimensionObject;
 
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultPartition;
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamWidgetOutputOperator.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamWidgetOutputOperator.java
index 29c92e6..715cb6b 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamWidgetOutputOperator.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/LogstreamWidgetOutputOperator.java
@@ -26,11 +26,10 @@ import java.util.Map.Entry;
 
 import javax.validation.constraints.NotNull;
 
+import org.apache.apex.malhar.lib.io.WidgetOutputOperator;
+import org.apache.apex.malhar.lib.logs.DimensionObject;
 import org.apache.commons.lang3.tuple.MutablePair;
 
-import com.datatorrent.lib.io.WidgetOutputOperator;
-import com.datatorrent.lib.logs.DimensionObject;
-
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultInputPort;
 
diff --git a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/RabbitMQLogsInputOperator.java b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/RabbitMQLogsInputOperator.java
index a72dd05..a4e7fd2 100644
--- a/apps/logstream/src/main/java/com/datatorrent/apps/logstream/RabbitMQLogsInputOperator.java
+++ b/apps/logstream/src/main/java/com/datatorrent/apps/logstream/RabbitMQLogsInputOperator.java
@@ -24,13 +24,14 @@ import org.codehaus.jettison.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.contrib.rabbitmq.AbstractSinglePortRabbitMQInputOperator;
+
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.Partitioner.PartitioningContext;
 import com.datatorrent.api.DefaultPartition;
 import com.datatorrent.api.Partitioner;
 import com.datatorrent.apps.logstream.PropertyRegistry.LogstreamPropertyRegistry;
 import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.contrib.rabbitmq.AbstractSinglePortRabbitMQInputOperator;
 
 /**
  *
diff --git a/apps/logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorTest.java b/apps/logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorTest.java
index 1ecd094..6eadc6e 100644
--- a/apps/logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorTest.java
+++ b/apps/logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorTest.java
@@ -26,11 +26,10 @@ import java.util.Map.Entry;
 import org.junit.Assert;
 import org.junit.Test;
 
+import org.apache.apex.malhar.lib.logs.DimensionObject;
+import org.apache.apex.malhar.lib.testbench.CollectorTestSink;
 import org.apache.commons.lang.mutable.MutableDouble;
 
-import com.datatorrent.lib.logs.DimensionObject;
-import com.datatorrent.lib.testbench.CollectorTestSink;
-
 import com.datatorrent.apps.logstream.PropertyRegistry.LogstreamPropertyRegistry;
 import com.datatorrent.netlet.util.DTThrowable;
 
diff --git a/apps/logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorUnifierTest.java b/apps/logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorUnifierTest.java
index a835dab..05929e2 100644
--- a/apps/logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorUnifierTest.java
+++ b/apps/logstream/src/test/java/com/datatorrent/apps/logstream/DimensionOperatorUnifierTest.java
@@ -26,11 +26,10 @@ import org.junit.Assert;
 
 import org.junit.Test;
 
+import org.apache.apex.malhar.lib.logs.DimensionObject;
+import org.apache.apex.malhar.lib.testbench.CollectorTestSink;
 import org.apache.commons.lang.mutable.MutableDouble;
 
-import com.datatorrent.lib.logs.DimensionObject;
-import com.datatorrent.lib.testbench.CollectorTestSink;
-
 /**
  *
  * Tests logstream dimension operator unifier.
diff --git a/apps/logstream/src/test/java/com/datatorrent/apps/logstream/FilterOperatorTest.java b/apps/logstream/src/test/java/com/datatorrent/apps/logstream/FilterOperatorTest.java
index 2b7a5bd..a2bc229 100644
--- a/apps/logstream/src/test/java/com/datatorrent/apps/logstream/FilterOperatorTest.java
+++ b/apps/logstream/src/test/java/com/datatorrent/apps/logstream/FilterOperatorTest.java
@@ -23,7 +23,7 @@ import org.junit.Assert;
 
 import org.junit.Test;
 
-import com.datatorrent.lib.testbench.CollectorTestSink;
+import org.apache.apex.malhar.lib.testbench.CollectorTestSink;
 
 import com.datatorrent.apps.logstream.PropertyRegistry.LogstreamPropertyRegistry;
 
diff --git a/apps/logstream/src/test/java/com/datatorrent/apps/logstream/LogstreamTopNTest.java b/apps/logstream/src/test/java/com/datatorrent/apps/logstream/LogstreamTopNTest.java
index 69d0567..d83373c 100644
--- a/apps/logstream/src/test/java/com/datatorrent/apps/logstream/LogstreamTopNTest.java
+++ b/apps/logstream/src/test/java/com/datatorrent/apps/logstream/LogstreamTopNTest.java
@@ -26,11 +26,10 @@ import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
 
+import org.apache.apex.malhar.lib.logs.DimensionObject;
+import org.apache.apex.malhar.lib.testbench.CollectorTestSink;
 import org.apache.commons.lang.mutable.MutableDouble;
 
-import com.datatorrent.lib.logs.DimensionObject;
-import com.datatorrent.lib.testbench.CollectorTestSink;
-
 import com.datatorrent.apps.logstream.PropertyRegistry.LogstreamPropertyRegistry;
 
 /**
diff --git a/apps/pom.xml b/apps/pom.xml
index 679d623..1f46ecd 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.apex</groupId>
     <artifactId>malhar</artifactId>
-    <version>3.9.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>malhar-apps</artifactId>
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 0822549..1b921d7 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>malhar</artifactId>
     <groupId>org.apache.apex</groupId>
-    <version>3.9.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.apex</groupId>
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/ApplicationFixed.java b/benchmark/src/main/java/org/apache/apex/benchmark/ApplicationFixed.java
index aa10eea..1491f47 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/ApplicationFixed.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/ApplicationFixed.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import org.apache.hadoop.conf.Configuration;
 
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/Benchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/Benchmark.java
index d8d51b8..6992bd8 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/Benchmark.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/Benchmark.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import org.apache.hadoop.conf.Configuration;
 
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppInput.java b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppInput.java
index bf5b876..6e29652 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppInput.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppInput.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import org.apache.hadoop.conf.Configuration;
 
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppOutput.java b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppOutput.java
index 4f12791..95eaacc 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppOutput.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppOutput.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
+import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
@@ -25,7 +26,6 @@ import com.datatorrent.api.DAG.Locality;
 
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.testbench.RandomEventGenerator;
 
 /**
  *
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseInputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseInputOperator.java
index 8ae0a94..12e43e2 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseInputOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseInputOperator.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import java.util.ArrayList;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.datatorrent.contrib.couchbase.AbstractCouchBaseInputOperator;
-import com.datatorrent.contrib.couchbase.CouchBaseWindowStore;
+import org.apache.apex.malhar.contrib.couchbase.AbstractCouchBaseInputOperator;
+import org.apache.apex.malhar.contrib.couchbase.CouchBaseWindowStore;
 
 /**
  * <p>CouchBaseInputOperator class.</p>
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseOutputOperator.java
index 8b6fc49..43a8e91 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseOutputOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseOutputOperator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
-import com.datatorrent.contrib.couchbase.AbstractCouchBaseSetOperator;
+import org.apache.apex.malhar.contrib.couchbase.AbstractCouchBaseSetOperator;
 
 /**
  * <p>CouchBaseOutputOperator class.</p>
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/FixedTuplesInputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/FixedTuplesInputOperator.java
index f2582bd..c3248bf 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/FixedTuplesInputOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/FixedTuplesInputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import java.util.ArrayList;
 
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/RandomMapOutput.java b/benchmark/src/main/java/org/apache/apex/benchmark/RandomMapOutput.java
index 3342771..d5af7a5 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/RandomMapOutput.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/RandomMapOutput.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import java.util.HashMap;
 
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/RandomWordInputModule.java b/benchmark/src/main/java/org/apache/apex/benchmark/RandomWordInputModule.java
index 7d02de2..7224df3 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/RandomWordInputModule.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/RandomWordInputModule.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import javax.validation.constraints.Min;
 
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/WordCountOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/WordCountOperator.java
index 8c55404..1138e84 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/WordCountOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/WordCountOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 /*
  * To change this template, choose Tools | Templates and open the template in the editor.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java b/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java
index 0a880fd..3282e32 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.aerospike;
+package org.apache.apex.benchmark.aerospike;
 
+import org.apache.apex.malhar.contrib.aerospike.AerospikeTransactionalStore;
+import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.contrib.aerospike.AerospikeTransactionalStore;
-import com.datatorrent.lib.testbench.RandomEventGenerator;
 
 /**
  * Application to benchmark the performance of aerospike output operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputOperator.java
index f9ee689..bb3661b 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputOperator.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.aerospike;
+package org.apache.apex.benchmark.aerospike;
 
 import java.util.List;
 
+import org.apache.apex.malhar.contrib.aerospike.AbstractAerospikeTransactionalPutOperator;
+
 import com.aerospike.client.AerospikeException;
 import com.aerospike.client.Bin;
 import com.aerospike.client.Key;
 
-import com.datatorrent.contrib.aerospike.AbstractAerospikeTransactionalPutOperator;
-
 /**
  * <p>AerospikeOutputOperator class.</p>
  *
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkApplication.java b/benchmark/src/main/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkApplication.java
index f74311e..8e1d8b8 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkApplication.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkApplication.java
@@ -16,8 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.algo;
+package org.apache.apex.benchmark.algo;
 
+import org.apache.apex.malhar.lib.algo.UniqueCounter;
+import org.apache.apex.malhar.lib.converter.MapToKeyHashValuePairConverter;
+import org.apache.apex.malhar.lib.io.ConsoleOutputOperator;
+import org.apache.apex.malhar.lib.stream.Counter;
+import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context;
@@ -27,13 +32,6 @@ import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 import com.datatorrent.common.partitioner.StatelessPartitioner;
 
-import com.datatorrent.lib.algo.UniqueCounter;
-import com.datatorrent.lib.converter.MapToKeyHashValuePairConverter;
-import com.datatorrent.lib.io.ConsoleOutputOperator;
-
-import com.datatorrent.lib.stream.Counter;
-import com.datatorrent.lib.testbench.RandomEventGenerator;
-
 /**
  * Application to demonstrate PartitionableUniqueCount operator. <br>
  * The input operator generate random keys, which is sent to
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputBenchmarkApplication.java b/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputBenchmarkApplication.java
index 46d503f..6f91cd1 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputBenchmarkApplication.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputBenchmarkApplication.java
@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.cassandra;
+package org.apache.apex.benchmark.cassandra;
 
+import org.apache.apex.malhar.contrib.cassandra.CassandraTransactionalStore;
+import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
@@ -26,10 +28,6 @@ import com.datatorrent.api.StreamingApplication;
 
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 
-import com.datatorrent.contrib.cassandra.CassandraTransactionalStore;
-
-import com.datatorrent.lib.testbench.RandomEventGenerator;
-
 /**
  * Application to benchmark the performance of cassandra output operator.
  * The operator was tested on following configuration:
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputOperator.java
index 592d8a2..90bc44b 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputOperator.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.cassandra;
+package org.apache.apex.benchmark.cassandra;
+
+import org.apache.apex.malhar.contrib.cassandra.AbstractCassandraTransactionableOutputOperator;
 
 import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Statement;
 import com.datastax.driver.core.exceptions.DriverException;
 
-import com.datatorrent.contrib.cassandra.AbstractCassandraTransactionableOutputOperator;
-
 /**
  * <p>CassandraOutputOperator class.</p>
  *
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSByteOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSByteOutputOperator.java
index ce0821c..56dd731 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSByteOutputOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSByteOutputOperator.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.fs;
+package org.apache.apex.benchmark.fs;
 
 import java.util.Arrays;
 
 import javax.validation.constraints.Min;
 
-import com.datatorrent.lib.io.fs.AbstractFileOutputOperator;
+import org.apache.apex.malhar.lib.io.fs.AbstractFileOutputOperator;
 
 /**
  * This output operator receives
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSOutputOperatorBenchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSOutputOperatorBenchmark.java
index 7a63d18..baddbc1 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSOutputOperatorBenchmark.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSOutputOperatorBenchmark.java
@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.fs;
+package org.apache.apex.benchmark.fs;
 
+import org.apache.apex.malhar.lib.counters.BasicCounters;
+import org.apache.apex.malhar.lib.testbench.RandomWordGenerator;
 import org.apache.commons.lang.mutable.MutableLong;
 import org.apache.hadoop.conf.Configuration;
 
@@ -29,10 +31,6 @@ import com.datatorrent.api.StreamingApplication;
 
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 
-import com.datatorrent.lib.counters.BasicCounters;
-
-import com.datatorrent.lib.testbench.RandomWordGenerator;
-
 /**
  * Application used to benchmark HDFS output operator
  * The DAG consists of random word generator operator that is
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkingApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkingApp.java
index 95fa961..2ecb2eb 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkingApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkingApp.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.hive;
+package org.apache.apex.benchmark.hive;
 
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -28,6 +28,9 @@ import javax.validation.constraints.Min;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.hive.AbstractFSRollingOutputOperator;
+import org.apache.apex.malhar.hive.HiveOperator;
+import org.apache.apex.malhar.hive.HiveStore;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.OperatorContext;
@@ -39,9 +42,6 @@ import com.datatorrent.api.InputOperator;
 import com.datatorrent.api.StreamingApplication;
 
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.contrib.hive.AbstractFSRollingOutputOperator;
-import com.datatorrent.contrib.hive.HiveOperator;
-import com.datatorrent.contrib.hive.HiveStore;
 
 /**
  * Application used to benchmark HIVE Insert operator
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveMapInsertBenchmarkingApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveMapInsertBenchmarkingApp.java
index 98d9ce3..800fa5a 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveMapInsertBenchmarkingApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveMapInsertBenchmarkingApp.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.hive;
+package org.apache.apex.benchmark.hive;
 
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -27,18 +27,17 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.benchmark.RandomMapOutput;
+import org.apache.apex.malhar.hive.AbstractFSRollingOutputOperator;
+import org.apache.apex.malhar.hive.HiveOperator;
+import org.apache.apex.malhar.hive.HiveStore;
+import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.PortContext;
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.benchmark.RandomMapOutput;
-
-import com.datatorrent.contrib.hive.AbstractFSRollingOutputOperator;
-import com.datatorrent.contrib.hive.HiveOperator;
-import com.datatorrent.contrib.hive.HiveStore;
-import com.datatorrent.lib.testbench.RandomEventGenerator;
 
 
 /**
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkKafkaInputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkKafkaInputOperator.java
index e147ad7..0bde5ed 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkKafkaInputOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkKafkaInputOperator.java
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.kafka;
+package org.apache.apex.benchmark.kafka;
+
+import org.apache.apex.malhar.contrib.kafka.AbstractKafkaInputOperator;
 
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.contrib.kafka.AbstractKafkaInputOperator;
 
 import kafka.message.Message;
 
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java
index 6353c37..37b4d0a 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.kafka;
+package org.apache.apex.benchmark.kafka;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmark.java
index ead6c66..e51da05 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmark.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmark.java
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.kafka;
+package org.apache.apex.benchmark.kafka;
 
 import java.util.Properties;
 
-
+import org.apache.apex.malhar.contrib.kafka.HighlevelKafkaConsumer;
+import org.apache.apex.malhar.contrib.kafka.KafkaConsumer;
+import org.apache.apex.malhar.contrib.kafka.SimpleKafkaConsumer;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.OperatorContext;
@@ -35,9 +37,6 @@ import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 
 import com.datatorrent.common.util.BaseOperator;
-import com.datatorrent.contrib.kafka.HighlevelKafkaConsumer;
-import com.datatorrent.contrib.kafka.KafkaConsumer;
-import com.datatorrent.contrib.kafka.SimpleKafkaConsumer;
 
 /**
  * The stream app to test the benckmark of kafka
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmark.java
index 0dd4352..e8578a6 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmark.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmark.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.kafka;
+package org.apache.apex.benchmark.kafka;
 
 import org.apache.hadoop.conf.Configuration;
 
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaTestPartitioner.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaTestPartitioner.java
index 65601d5..64ef2c7 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaTestPartitioner.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaTestPartitioner.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.kafka;
+package org.apache.apex.benchmark.kafka;
 
 import kafka.producer.Partitioner;
 import kafka.utils.VerifiableProperties;
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/package-info.java b/benchmark/src/main/java/org/apache/apex/benchmark/package-info.java
index 5ee1888..9f99b8f 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/package-info.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/package-info.java
@@ -19,4 +19,4 @@
 /**
  * Apex malhar performance demonstration application.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkApplication.java b/benchmark/src/main/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkApplication.java
index b86cd01..065f546 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkApplication.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkApplication.java
@@ -16,8 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.script;
+package org.apache.apex.benchmark.script;
 
+import org.apache.apex.benchmark.RandomMapOutput;
+import org.apache.apex.malhar.contrib.ruby.RubyOperator;
+import org.apache.apex.malhar.lib.io.ConsoleOutputOperator;
+import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.PortContext;
@@ -27,12 +31,6 @@ import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 
-import com.datatorrent.benchmark.RandomMapOutput;
-import com.datatorrent.contrib.ruby.RubyOperator;
-
-import com.datatorrent.lib.io.ConsoleOutputOperator;
-import com.datatorrent.lib.testbench.RandomEventGenerator;
-
 /**
  *
  * Application to benchmark the performance of ruby operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkApp.java
index 300ea64..4419a11 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkApp.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.spillable;
+package org.apache.apex.benchmark.spillable;
 
+import org.apache.apex.malhar.lib.fileaccess.TFileImpl;
 import org.apache.apex.malhar.lib.state.spillable.managed.ManagedStateSpillableStateStore;
 import org.apache.hadoop.conf.Configuration;
 
@@ -26,7 +27,6 @@ import com.google.common.base.Preconditions;
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.fileaccess.TFileImpl;
 
 @ApplicationAnnotation(name = "SpillableBenchmarkApp")
 /**
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestInputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestInputOperator.java
index 9bee9a6..0285f04 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestInputOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestInputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.spillable;
+package org.apache.apex.benchmark.spillable;
 
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestOperator.java
index 7c45106..c827acb 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.spillable;
+package org.apache.apex.benchmark.spillable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkApp.java
index 2dc6f0d..5ba8a33 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkApp.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.state;
+package org.apache.apex.benchmark.state;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -27,7 +27,9 @@ import org.joda.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.fileaccess.TFileImpl;
 import org.apache.apex.malhar.lib.state.managed.ManagedTimeUnifiedStateImpl;
+import org.apache.apex.malhar.lib.util.KeyValPair;
 import org.apache.hadoop.conf.Configuration;
 
 import com.google.common.collect.Lists;
@@ -43,8 +45,6 @@ import com.datatorrent.api.StatsListener;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 import com.datatorrent.common.util.BaseOperator;
-import com.datatorrent.lib.fileaccess.TFileImpl;
-import com.datatorrent.lib.util.KeyValPair;
 
 @ApplicationAnnotation(name = "ManagedStateBenchmark")
 /**
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/state/StoreOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/state/StoreOperator.java
index 60a775c..eea4ac5 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/state/StoreOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/state/StoreOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.state;
+package org.apache.apex.benchmark.state;
 
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.apex.malhar.lib.state.managed.ManagedTimeUnifiedStateImpl;
+import org.apache.apex.malhar.lib.util.KeyValPair;
 
 import com.google.common.collect.Maps;
 
@@ -35,7 +36,6 @@ import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.Operator;
 import com.datatorrent.common.util.BaseOperator;
-import com.datatorrent.lib.util.KeyValPair;
 import com.datatorrent.netlet.util.Slice;
 
 /**
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/stream/DevNullCounterBenchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/stream/DevNullCounterBenchmark.java
index b0b7314..ef853e1 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/stream/DevNullCounterBenchmark.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/stream/DevNullCounterBenchmark.java
@@ -16,8 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.stream;
+package org.apache.apex.benchmark.stream;
 
+import org.apache.apex.malhar.lib.stream.DevNullCounter;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.PortContext;
@@ -25,11 +26,10 @@ import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNullCounter;
 
 /**
  *
- * Functional tests for {@link com.datatorrent.lib.testbench.DevNullCounter}.
+ * Functional tests for {@link org.apache.apex.malhar.lib.testbench.DevNullCounter}.
  * <p>
  * <br>
  * oper.process is called a billion times<br>
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/stream/IntegerOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/stream/IntegerOperator.java
index c716206..1fca7e5 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/stream/IntegerOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/stream/IntegerOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.stream;
+package org.apache.apex.benchmark.stream;
 
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamDuplicaterApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamDuplicaterApp.java
index 2e5bcf9..37936e6 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamDuplicaterApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamDuplicaterApp.java
@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.stream;
+package org.apache.apex.benchmark.stream;
 
+import org.apache.apex.malhar.lib.stream.DevNull;
+import org.apache.apex.malhar.lib.stream.StreamDuplicater;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.PortContext;
@@ -25,8 +27,6 @@ import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNull;
-import com.datatorrent.lib.stream.StreamDuplicater;
 
 /**
  * Benchmark App for StreamDuplicater Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamMergeApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamMergeApp.java
index bb1d081..de9507a 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamMergeApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamMergeApp.java
@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.stream;
+package org.apache.apex.benchmark.stream;
 
+import org.apache.apex.benchmark.WordCountOperator;
+import org.apache.apex.malhar.lib.stream.StreamMerger;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.PortContext;
@@ -25,8 +27,6 @@ import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.benchmark.WordCountOperator;
-import com.datatorrent.lib.stream.StreamMerger;
 
 /**
  * Benchmark App for StreamMerge Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierApp.java
index b1ddbee..d12267e 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierApp.java
@@ -16,11 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.apache.apex.malhar.lib.stream.DevNull;
+import org.apache.apex.malhar.lib.testbench.EventClassifier;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.PortContext;
@@ -28,8 +30,6 @@ import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNull;
-import com.datatorrent.lib.testbench.EventClassifier;
 
 /**
  * Benchmark App for EventClassifier Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java
index 5fe478b..c1405fc 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java
@@ -16,10 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.util.HashMap;
 
+import org.apache.apex.benchmark.WordCountOperator;
+import org.apache.apex.benchmark.stream.IntegerOperator;
+import org.apache.apex.malhar.lib.testbench.EventClassifierNumberToHashDouble;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.PortContext;
@@ -27,9 +30,6 @@ import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.benchmark.WordCountOperator;
-import com.datatorrent.benchmark.stream.IntegerOperator;
-import com.datatorrent.lib.testbench.EventClassifierNumberToHashDouble;
 
 /**
  * Benchmark App for EventClassifierNumberToHashDouble Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventGeneratorApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventGeneratorApp.java
index 8f28ae6..0c997dc 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventGeneratorApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventGeneratorApp.java
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.util.HashMap;
 
+import org.apache.apex.malhar.lib.stream.DevNull;
+import org.apache.apex.malhar.lib.testbench.EventGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.PortContext;
@@ -27,8 +29,6 @@ import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNull;
-import com.datatorrent.lib.testbench.EventGenerator;
 
 /**
  * Benchmark App for EventGenerator Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventIncrementerApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventIncrementerApp.java
index e562224..d7aa2dc 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventIncrementerApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventIncrementerApp.java
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.apache.apex.malhar.lib.stream.DevNull;
+import org.apache.apex.malhar.lib.testbench.EventIncrementer;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNull;
-import com.datatorrent.lib.testbench.EventIncrementer;
 
 /**
  * Benchmark App for EventIncrementer Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilterClassifierApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilterClassifierApp.java
index ea2943f..57664ac 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilterClassifierApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilterClassifierApp.java
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.apache.apex.malhar.lib.stream.DevNull;
+import org.apache.apex.malhar.lib.testbench.FilterClassifier;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNull;
-import com.datatorrent.lib.testbench.FilterClassifier;
 
 /**
  * Benchmark App for FilterClassifier Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierApp.java
index 52c0bed..f282838 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierApp.java
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.apache.apex.malhar.lib.stream.DevNull;
+import org.apache.apex.malhar.lib.testbench.FilteredEventClassifier;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNull;
-import com.datatorrent.lib.testbench.FilteredEventClassifier;
 
 /**
  * Benchmark App for FilteredEventClassifier Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/HashMapOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/HashMapOperator.java
index 29cd079..66fab36 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/HashMapOperator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/HashMapOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,10 +24,11 @@ import java.util.HashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.testbench.EventGenerator;
+
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.InputOperator;
-import com.datatorrent.lib.testbench.EventGenerator;
 
 /**
  * HashMap Input Operator used as a helper in testbench benchmarking apps.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/RandomEventGeneratorApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/RandomEventGeneratorApp.java
index df5b11e..bdca047 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/RandomEventGeneratorApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/RandomEventGeneratorApp.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
+import org.apache.apex.malhar.lib.stream.DevNull;
+import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNull;
-import com.datatorrent.lib.testbench.RandomEventGenerator;
 
 /**
  * Benchmark App for RandomEventGenerator Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/SeedEventGeneratorApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/SeedEventGeneratorApp.java
index faafcbf..0b7f7b5 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/SeedEventGeneratorApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/SeedEventGeneratorApp.java
@@ -16,10 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+
+import org.apache.apex.malhar.lib.stream.DevNull;
+import org.apache.apex.malhar.lib.testbench.SeedEventGenerator;
+import org.apache.apex.malhar.lib.util.KeyValPair;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.PortContext;
@@ -27,9 +31,6 @@ import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNull;
-import com.datatorrent.lib.testbench.SeedEventGenerator;
-import com.datatorrent.lib.util.KeyValPair;
 
 
 /**
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/ThroughputCounterApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/ThroughputCounterApp.java
index d6e762e..4ad35f9 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/testbench/ThroughputCounterApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/ThroughputCounterApp.java
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.util.HashMap;
 
+import org.apache.apex.malhar.lib.stream.DevNull;
+import org.apache.apex.malhar.lib.testbench.ThroughputCounter;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.stream.DevNull;
-import com.datatorrent.lib.testbench.ThroughputCounter;
 
 /**
  * Benchmark App for ThroughputCounter Operator.
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractGenerator.java b/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractGenerator.java
index bfdc0ec..a12354e 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractGenerator.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractGenerator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.window;
+package org.apache.apex.benchmark.window;
 
 import java.nio.ByteBuffer;
 import java.util.Random;
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java
index 7a345fe..dc0ad48 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.window;
+package org.apache.apex.benchmark.window;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -25,10 +25,13 @@ import org.joda.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.benchmark.window.WindowedOperatorBenchmarkApp.WindowedGenerator;
+import org.apache.apex.malhar.lib.fileaccess.TFileImpl;
 import org.apache.apex.malhar.lib.state.managed.UnboundedTimeBucketAssigner;
 import org.apache.apex.malhar.lib.state.spillable.SpillableComplexComponentImpl;
 import org.apache.apex.malhar.lib.state.spillable.SpillableStateStore;
 import org.apache.apex.malhar.lib.state.spillable.managed.ManagedTimeUnifiedStateSpillableStateStore;
+import org.apache.apex.malhar.lib.stream.DevNull;
 import org.apache.apex.malhar.lib.window.Accumulation;
 import org.apache.apex.malhar.lib.window.TriggerOption;
 import org.apache.apex.malhar.lib.window.WindowOption;
@@ -47,9 +50,6 @@ import com.datatorrent.api.Operator;
 import com.datatorrent.api.Stats.OperatorStats;
 import com.datatorrent.api.StatsListener;
 import com.datatorrent.api.StreamingApplication;
-import com.datatorrent.benchmark.window.WindowedOperatorBenchmarkApp.WindowedGenerator;
-import com.datatorrent.lib.fileaccess.TFileImpl;
-import com.datatorrent.lib.stream.DevNull;
 
 /**
  * @since 3.7.0
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java
index 7e38584..b8dce7f 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java
@@ -16,14 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.window;
+package org.apache.apex.benchmark.window;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.fileaccess.TFileImpl;
 import org.apache.apex.malhar.lib.state.spillable.SpillableComplexComponentImpl;
 import org.apache.apex.malhar.lib.state.spillable.SpillableSetMultimapImpl;
 import org.apache.apex.malhar.lib.state.spillable.managed.ManagedStateSpillableStateStore;
+import org.apache.apex.malhar.lib.util.KeyValPair;
 import org.apache.apex.malhar.lib.utils.serde.GenericSerde;
 import org.apache.apex.malhar.lib.window.Accumulation;
 import org.apache.apex.malhar.lib.window.Tuple;
@@ -39,8 +41,6 @@ import org.apache.hadoop.conf.Configuration;
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.lib.fileaccess.TFileImpl;
-import com.datatorrent.lib.util.KeyValPair;
 
 /**
  * @since 3.7.0
diff --git a/benchmark/src/main/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkApp.java
index 7e402fc..15a577e 100644
--- a/benchmark/src/main/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkApp.java
+++ b/benchmark/src/main/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkApp.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.window;
+package org.apache.apex.benchmark.window;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/ApplicationFixedTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/ApplicationFixedTest.java
index cd8a3ec..644cd01 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/ApplicationFixedTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/ApplicationFixedTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import java.io.IOException;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/BenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/BenchmarkTest.java
index 0a21a7c..c5249a2 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/BenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/BenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import java.io.IOException;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/CouchBaseBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/CouchBaseBenchmarkTest.java
index 6a1c968..aef17b3 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/CouchBaseBenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/CouchBaseBenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark;
+package org.apache.apex.benchmark;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloApp.java b/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloApp.java
index e2936fe..3417b58 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloApp.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloApp.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.accumulo;
+package org.apache.apex.benchmark.accumulo;
 
 import org.apache.accumulo.core.data.Mutation;
+import org.apache.apex.malhar.contrib.accumulo.AbstractAccumuloOutputOperator;
+import org.apache.apex.malhar.contrib.accumulo.AccumuloRowTupleGenerator;
+import org.apache.apex.malhar.contrib.accumulo.AccumuloTestHelper;
+import org.apache.apex.malhar.contrib.accumulo.AccumuloTuple;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.StreamingApplication;
-import com.datatorrent.contrib.accumulo.AbstractAccumuloOutputOperator;
-import com.datatorrent.contrib.accumulo.AccumuloRowTupleGenerator;
-import com.datatorrent.contrib.accumulo.AccumuloTestHelper;
-import com.datatorrent.contrib.accumulo.AccumuloTuple;
 
 /**
  * BenchMark Results
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloAppTest.java
index 8b47a9b..0f48d16 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.accumulo;
+package org.apache.apex.benchmark.accumulo;
 
 import org.junit.Test;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/aerospike/AerospikeBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/aerospike/AerospikeBenchmarkAppTest.java
index 14fe441..9eea1b7 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/aerospike/AerospikeBenchmarkAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/aerospike/AerospikeBenchmarkAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.aerospike;
+package org.apache.apex.benchmark.aerospike;
 
 import org.junit.Test;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkTest.java
index 079d073..56c0cf2 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.algo;
+package org.apache.apex.benchmark.algo;
 
 import org.junit.Test;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/cassandra/CassandraApplicatonTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/cassandra/CassandraApplicatonTest.java
index ec4f308..1708eaf 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/cassandra/CassandraApplicatonTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/cassandra/CassandraApplicatonTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.cassandra;
+package org.apache.apex.benchmark.cassandra;
 
 import org.junit.Test;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseApplicationTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseApplicationTest.java
index 32a4907..94bc6a9 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseApplicationTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseApplicationTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.hbase;
+package org.apache.apex.benchmark.hbase;
 
 import org.junit.Test;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseCsvMappingApplication.java b/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseCsvMappingApplication.java
index b61f1d3..b6ec667 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseCsvMappingApplication.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseCsvMappingApplication.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.hbase;
+package org.apache.apex.benchmark.hbase;
 
+import org.apache.apex.malhar.contrib.hbase.HBaseCsvMappingPutOperator;
+import org.apache.apex.malhar.contrib.hbase.HBaseRowStringGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.contrib.hbase.HBaseCsvMappingPutOperator;
-import com.datatorrent.contrib.hbase.HBaseRowStringGenerator;
 
 /**
  * BenchMark Results
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkTest.java
index 653c6f6..aa50e45 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.hive;
+package org.apache.apex.benchmark.hive;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveMapBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveMapBenchmarkTest.java
index e0097c6..6bd2edf 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveMapBenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveMapBenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.hive;
+package org.apache.apex.benchmark.hive;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmarkTest.java
index 6cb901a..8f2c42c 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.kafka;
+package org.apache.apex.benchmark.kafka;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmarkTest.java
index 4de7193..1823a00 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.kafka;
+package org.apache.apex.benchmark.kafka;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmark.java b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmark.java
index 9201cd5..413438a 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmark.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmark.java
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.memsql;
+package org.apache.apex.benchmark.memsql;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.contrib.memsql.MemsqlInputOperator;
+import org.apache.apex.malhar.lib.stream.DevNull;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.contrib.memsql.MemsqlInputOperator;
-import com.datatorrent.lib.stream.DevNull;
 
 /**
  * BenchMark Results
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmarkTest.java
index a596903..f3127a5 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.memsql;
+package org.apache.apex.benchmark.memsql;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -28,6 +28,9 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.contrib.memsql.AbstractMemsqlOutputOperatorTest;
+import org.apache.apex.malhar.contrib.memsql.MemsqlPOJOOutputOperator;
+import org.apache.apex.malhar.contrib.memsql.MemsqlStore;
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configuration;
 
@@ -35,15 +38,12 @@ import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.LocalMode;
 import com.datatorrent.api.Operator.ProcessingMode;
-import com.datatorrent.contrib.memsql.AbstractMemsqlOutputOperatorTest;
-import com.datatorrent.contrib.memsql.MemsqlPOJOOutputOperator;
-import com.datatorrent.contrib.memsql.MemsqlStore;
 import com.datatorrent.netlet.util.DTThrowable;
 
-import static com.datatorrent.contrib.memsql.AbstractMemsqlOutputOperatorTest.BATCH_SIZE;
-import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.APP_ID;
-import static com.datatorrent.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.OPERATOR_ID;
-import static com.datatorrent.lib.helper.OperatorContextTestHelper.mockOperatorContext;
+import static org.apache.apex.malhar.contrib.memsql.AbstractMemsqlOutputOperatorTest.BATCH_SIZE;
+import static org.apache.apex.malhar.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.APP_ID;
+import static org.apache.apex.malhar.lib.db.jdbc.JdbcNonTransactionalOutputOperatorTest.OPERATOR_ID;
+import static org.apache.apex.malhar.lib.helper.OperatorContextTestHelper.mockOperatorContext;
 
 public class MemsqlInputBenchmarkTest
 {
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmark.java b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmark.java
index 297bc6d..0b4f126 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmark.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmark.java
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.memsql;
+package org.apache.apex.benchmark.memsql;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.contrib.memsql.MemsqlPOJOOutputOperator;
+import org.apache.apex.malhar.lib.testbench.RandomEventGenerator;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
-import com.datatorrent.contrib.memsql.MemsqlPOJOOutputOperator;
-import com.datatorrent.lib.testbench.RandomEventGenerator;
 
 /**
  * BenchMark Results
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmarkTest.java
index bf82ab3..3d4766e 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.memsql;
+package org.apache.apex.benchmark.memsql;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -27,12 +27,12 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.contrib.memsql.AbstractMemsqlOutputOperatorTest;
+import org.apache.apex.malhar.contrib.memsql.MemsqlStore;
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.LocalMode;
-import com.datatorrent.contrib.memsql.AbstractMemsqlOutputOperatorTest;
-import com.datatorrent.contrib.memsql.MemsqlStore;
 import com.datatorrent.netlet.util.DTThrowable;
 
 public class MemsqlOutputBenchmarkTest
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkAppTest.java
index d270e7f..904ea6b 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.script;
+package org.apache.apex.benchmark.script;
 
 import org.junit.Test;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkAppTester.java b/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkAppTester.java
index cd2c640..6490aa9 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkAppTester.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkAppTester.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.spillable;
+package org.apache.apex.benchmark.spillable;
 
 import java.io.File;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableDSBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableDSBenchmarkTest.java
index b87fec1..f6ecf0c 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableDSBenchmarkTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableDSBenchmarkTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.spillable;
+package org.apache.apex.benchmark.spillable;
 
 import java.util.Random;
 
@@ -27,14 +27,13 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.fileaccess.TFileImpl;
 import org.apache.apex.malhar.lib.state.spillable.SpillableMapImpl;
 import org.apache.apex.malhar.lib.state.spillable.SpillableTestUtils;
 import org.apache.apex.malhar.lib.state.spillable.managed.ManagedStateSpillableStateStore;
 import org.apache.apex.malhar.lib.utils.serde.Serde;
 import org.apache.apex.malhar.lib.utils.serde.StringSerde;
 
-import com.datatorrent.lib.fileaccess.TFileImpl;
-
 public class SpillableDSBenchmarkTest
 {
   private static final Logger logger = LoggerFactory.getLogger(SpillableDSBenchmarkTest.class);
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkAppTest.java
index dc8f4b4..eb3cc7a 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkAppTest.java
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.state;
+package org.apache.apex.benchmark.state;
 
 import java.io.File;
 
 import org.junit.Before;
 import org.junit.Test;
 
+import org.apache.apex.benchmark.state.StoreOperator.ExecMode;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileUtil;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.LocalMode;
 import com.datatorrent.api.StreamingApplication;
-import com.datatorrent.benchmark.state.StoreOperator.ExecMode;
 
 /**
  * This is not a really unit test, but in fact a benchmark runner.
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierAppTest.java
index 99d8a1f..88d66b4 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java
index 929d8bc..9fb4638 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventGeneratorAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventGeneratorAppTest.java
index 5a427a5..0a71ea4 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventGeneratorAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventGeneratorAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventIncrementerAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventIncrementerAppTest.java
index 1a85a7b..fb4401e 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventIncrementerAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventIncrementerAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilterClassifierAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilterClassifierAppTest.java
index 9419022..c921a4c 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilterClassifierAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilterClassifierAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierAppTest.java
index 977d6b7..658e372 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/ThroughputCounterAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/ThroughputCounterAppTest.java
index 92ca0fd..b278f6d 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/testbench/ThroughputCounterAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/ThroughputCounterAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.testbench;
+package org.apache.apex.benchmark.testbench;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/util/serde/GenericSerdePerformanceTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/util/serde/GenericSerdePerformanceTest.java
index 157accc..64fca9e 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/util/serde/GenericSerdePerformanceTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/util/serde/GenericSerdePerformanceTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.util.serde;
+package org.apache.apex.benchmark.util.serde;
 
 import java.util.Random;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java
index 2bc9335..fe9ba0c 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.window;
+package org.apache.apex.benchmark.window;
 
 import java.io.File;
 
diff --git a/benchmark/src/test/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkAppTest.java
index 4a16396..b6f3549 100644
--- a/benchmark/src/test/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkAppTest.java
+++ b/benchmark/src/test/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkAppTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.benchmark.window;
+package org.apache.apex.benchmark.window;
 
 import java.io.File;
 
diff --git a/contrib/pom.xml b/contrib/pom.xml
index a69ad29..13c77b9 100755
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.apex</groupId>
     <artifactId>malhar</artifactId>
-    <version>3.9.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>malhar-contrib</artifactId>
@@ -36,7 +36,6 @@
     <!-- skip tests by default as they depend on manual setup -->
     <skip.contrib.module.tests>false</skip.contrib.module.tests>
     <skipTests>true</skipTests>
-    <checkstyle.console>false</checkstyle.console>
   </properties>
   <repositories>
     <repository>
@@ -217,14 +216,6 @@
         <artifactId>japicmp-maven-plugin</artifactId>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <maxAllowedViolations>2709</maxAllowedViolations>
-          <logViolationsToConsole>${checkstyle.console}</logViolationsToConsole>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloInputOperator.java
index 50a1056..8250cd0 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloInputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.accumulo;
+package org.apache.apex.malhar.contrib.accumulo;
 
 import java.util.Map.Entry;
 
@@ -24,8 +24,8 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
+import org.apache.apex.malhar.lib.db.AbstractStoreInputOperator;
 
-import com.datatorrent.lib.db.AbstractStoreInputOperator;
 /**
  * Base input adapter, which reads data from persistence database and writes into output port(s).&nbsp; Subclasses should provide the
  * implementation of getting the tuples and scanner methods.
@@ -38,18 +38,21 @@ import com.datatorrent.lib.db.AbstractStoreInputOperator;
  * @tags key value, accumulo
  * @since 1.0.4
  */
-public abstract class AbstractAccumuloInputOperator<T> extends AbstractStoreInputOperator<T, AccumuloStore> {
+public abstract class AbstractAccumuloInputOperator<T> extends AbstractStoreInputOperator<T, AccumuloStore>
+{
 
   public abstract T getTuple(Entry<Key, Value> entry);
 
   public abstract Scanner getScanner(Connector conn);
 
-  public AbstractAccumuloInputOperator() {
+  public AbstractAccumuloInputOperator()
+  {
     store = new AccumuloStore();
   }
 
   @Override
-  public void emitTuples() {
+  public void emitTuples()
+  {
     Connector conn = store.getConnector();
     Scanner scan = getScanner(conn);
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloOutputOperator.java
index a4ae1ac..153f88d 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloOutputOperator.java
@@ -16,19 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.accumulo;
+package org.apache.apex.malhar.contrib.accumulo;
 
 import java.util.List;
 
-import org.apache.accumulo.core.client.MutationsRejectedException;
-import org.apache.accumulo.core.data.Mutation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.accumulo.core.client.MutationsRejectedException;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.apex.malhar.lib.db.AbstractAggregateTransactionableStoreOutputOperator;
+
+import com.google.common.collect.Lists;
+
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.db.AbstractAggregateTransactionableStoreOutputOperator;
-import com.google.common.collect.Lists;
 
 /**
  * Base output operator that stores tuples in Accumulo rows.&nbsp; Subclasses should provide implementation of operationMutation method. <br>
@@ -56,7 +58,8 @@ import com.google.common.collect.Lists;
  *            The tuple type
  * @since 1.0.4
  */
-public abstract class AbstractAccumuloOutputOperator<T> extends AbstractAggregateTransactionableStoreOutputOperator<T, AccumuloWindowStore> {
+public abstract class AbstractAccumuloOutputOperator<T> extends AbstractAggregateTransactionableStoreOutputOperator<T, AccumuloWindowStore>
+{
   private static final transient Logger logger = LoggerFactory.getLogger(AbstractAccumuloOutputOperator.class);
   private final List<T> tuples;
   private transient ProcessingMode mode;
@@ -75,6 +78,7 @@ public abstract class AbstractAccumuloOutputOperator<T> extends AbstractAggregat
     tuples = Lists.newArrayList();
     store = new AccumuloWindowStore();
   }
+
   @Override
   public void processTuple(T tuple)
   {
@@ -82,7 +86,8 @@ public abstract class AbstractAccumuloOutputOperator<T> extends AbstractAggregat
   }
 
   @Override
-  public void storeAggregate() {
+  public void storeAggregate()
+  {
     try {
       for (T tuple : tuples) {
         Mutation mutation = operationMutation(tuple);
@@ -96,6 +101,7 @@ public abstract class AbstractAccumuloOutputOperator<T> extends AbstractAggregat
     }
     tuples.clear();
   }
+
   /**
    *
    * @param t
@@ -106,11 +112,11 @@ public abstract class AbstractAccumuloOutputOperator<T> extends AbstractAggregat
   @Override
   public void setup(OperatorContext context)
   {
-    mode=context.getValue(context.PROCESSING_MODE);
-    if(mode==ProcessingMode.EXACTLY_ONCE){
+    mode = context.getValue(context.PROCESSING_MODE);
+    if (mode == ProcessingMode.EXACTLY_ONCE) {
       throw new RuntimeException("This operator only supports atmost once and atleast once processing modes");
     }
-    if(mode==ProcessingMode.AT_MOST_ONCE){
+    if (mode == ProcessingMode.AT_MOST_ONCE) {
       tuples.clear();
     }
     super.setup(context);
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloStore.java
index 52d273a..2eb4db0 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloStore.java
@@ -16,10 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.accumulo;
+package org.apache.apex.malhar.contrib.accumulo;
 
 import java.io.IOException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchWriter;
@@ -30,11 +33,9 @@ import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.apex.malhar.lib.db.Connectable;
 
 import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.db.Connectable;
 
 /**
  * A {@link Connectable} for accumulo that implements Connectable interface.
@@ -45,7 +46,8 @@ import com.datatorrent.lib.db.Connectable;
  * @param <T>
  * @since 1.0.4
  */
-public class AccumuloStore implements Connectable {
+public class AccumuloStore implements Connectable
+{
   private static final transient Logger logger = LoggerFactory.getLogger(AccumuloStore.class);
   private String zookeeperHost;
   private String instanceName;
@@ -58,12 +60,13 @@ public class AccumuloStore implements Connectable {
 
   private long memoryLimit;
   private int numThreads;
-  private static final long DEFAULT_MEMORY=2147483648l;
-  private static final int DEFAULT_THREADS=1;
+  private static final long DEFAULT_MEMORY = 2147483648L;
+  private static final int DEFAULT_THREADS = 1;
 
-  public AccumuloStore(){
-    memoryLimit=DEFAULT_MEMORY;
-    numThreads=DEFAULT_THREADS;
+  public AccumuloStore()
+  {
+    memoryLimit = DEFAULT_MEMORY;
+    numThreads = DEFAULT_THREADS;
   }
 
   /**
@@ -71,7 +74,8 @@ public class AccumuloStore implements Connectable {
    *
    * @return Connector
    */
-  public Connector getConnector() {
+  public Connector getConnector()
+  {
     return connector;
   }
 
@@ -80,7 +84,8 @@ public class AccumuloStore implements Connectable {
    *
    * @return TableName
    */
-  public String getTableName() {
+  public String getTableName()
+  {
     return tableName;
   }
 
@@ -89,7 +94,8 @@ public class AccumuloStore implements Connectable {
    *
    * @param tableName
    */
-  public void setTableName(String tableName) {
+  public void setTableName(String tableName)
+  {
     this.tableName = tableName;
   }
 
@@ -98,7 +104,8 @@ public class AccumuloStore implements Connectable {
    *
    * @return ZookeeperHost
    */
-  public String getZookeeperHost() {
+  public String getZookeeperHost()
+  {
     return zookeeperHost;
   }
 
@@ -107,7 +114,8 @@ public class AccumuloStore implements Connectable {
    *
    * @param zookeeperHost
    */
-  public void setZookeeperHost(String zookeeperHost) {
+  public void setZookeeperHost(String zookeeperHost)
+  {
     this.zookeeperHost = zookeeperHost;
   }
 
@@ -116,7 +124,8 @@ public class AccumuloStore implements Connectable {
    *
    * @return instanceName
    */
-  public String getInstanceName() {
+  public String getInstanceName()
+  {
     return instanceName;
   }
 
@@ -125,7 +134,8 @@ public class AccumuloStore implements Connectable {
    *
    * @param instanceName
    */
-  public void setInstanceName(String instanceName) {
+  public void setInstanceName(String instanceName)
+  {
     this.instanceName = instanceName;
   }
 
@@ -134,7 +144,8 @@ public class AccumuloStore implements Connectable {
    *
    * @param userName
    */
-  public void setUserName(String userName) {
+  public void setUserName(String userName)
+  {
     this.userName = userName;
   }
 
@@ -143,23 +154,28 @@ public class AccumuloStore implements Connectable {
    *
    * @param password
    */
-  public void setPassword(String password) {
+  public void setPassword(String password)
+  {
     this.password = password;
   }
+
   /**
    * setter for memory limit
    *
    * @param memoryLimit
    */
-  public void setMemoryLimit(long memoryLimit) {
+  public void setMemoryLimit(long memoryLimit)
+  {
     this.memoryLimit = memoryLimit;
   }
+
   /**
    * setter for number of writer threads
    *
    * @param numThreads
    */
-  public void setNumThreads(int numThreads) {
+  public void setNumThreads(int numThreads)
+  {
     this.numThreads = numThreads;
   }
 
@@ -168,12 +184,14 @@ public class AccumuloStore implements Connectable {
    *
    * @return BatchWriter
    */
-  public BatchWriter getBatchwriter() {
+  public BatchWriter getBatchwriter()
+  {
     return batchwriter;
   }
 
   @Override
-  public void connect() throws IOException {
+  public void connect() throws IOException
+  {
     Instance instance = null;
     instance = new ZooKeeperInstance(instanceName, zookeeperHost);
     try {
@@ -198,7 +216,8 @@ public class AccumuloStore implements Connectable {
   }
 
   @Override
-  public void disconnect() throws IOException {
+  public void disconnect() throws IOException
+  {
     try {
       batchwriter.close();
     } catch (MutationsRejectedException e) {
@@ -208,7 +227,8 @@ public class AccumuloStore implements Connectable {
   }
 
   @Override
-  public boolean isConnected() {
+  public boolean isConnected()
+  {
     // Not applicable for accumulo
     return false;
   }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloWindowStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloWindowStore.java
index 9bec031..412ae14 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloWindowStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloWindowStore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.accumulo;
+package org.apache.apex.malhar.contrib.accumulo;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,6 +25,9 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.Map.Entry;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.accumulo.core.client.MutationsRejectedException;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.TableNotFoundException;
@@ -33,12 +36,10 @@ import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.security.Authorizations;
+import org.apache.apex.malhar.lib.db.TransactionableStore;
 import org.apache.hadoop.io.Text;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.db.TransactionableStore;
 
 /**
  * Provides transactional support by implementing TransactionableStore abstract methods.
@@ -53,7 +54,8 @@ import com.datatorrent.lib.db.TransactionableStore;
  * @tags accumulo, key value
  * @since 1.0.4
  */
-public class AccumuloWindowStore extends AccumuloStore implements TransactionableStore {
+public class AccumuloWindowStore extends AccumuloStore implements TransactionableStore
+{
   private static final transient Logger logger = LoggerFactory.getLogger(AccumuloWindowStore.class);
   private static final String DEFAULT_ROW_NAME = "AccumuloOperator_row";
   private static final String DEFAULT_COLUMN_FAMILY_NAME = "AccumuloOutputOperator_cf";
@@ -67,7 +69,8 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
   private transient String lastWindowColumnName;
   private transient byte[] lastWindowColumnBytes;
 
-  public AccumuloWindowStore() {
+  public AccumuloWindowStore()
+  {
     rowName = DEFAULT_ROW_NAME;
     columnFamilyName = DEFAULT_COLUMN_FAMILY_NAME;
     lastWindowColumnName = DEFAULT_LAST_WINDOW_PREFIX_COLUMN_NAME;
@@ -78,54 +81,64 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
    * the values are stored as byte arrays.This method converts string to byte
    * arrays. uses util class in hbase library to do so.
    */
-  private void constructKeys() {
+  private void constructKeys()
+  {
     rowBytes = rowName.getBytes();
     columnFamilyBytes = columnFamilyName.getBytes();
   }
 
-  public String getRowName() {
+  public String getRowName()
+  {
     return rowName;
   }
 
-  public void setRowName(String rowName) {
+  public void setRowName(String rowName)
+  {
     this.rowName = rowName;
     constructKeys();
   }
 
-  public String getColumnFamilyName() {
+  public String getColumnFamilyName()
+  {
     return columnFamilyName;
   }
 
-  public void setColumnFamilyName(String columnFamilyName) {
+  public void setColumnFamilyName(String columnFamilyName)
+  {
     this.columnFamilyName = columnFamilyName;
     constructKeys();
   }
 
   @Override
-  public void beginTransaction() {
+  public void beginTransaction()
+  {
     // accumulo does not support transactions
   }
 
   @Override
-  public void commitTransaction() {
+  public void commitTransaction()
+  {
     // accumulo does not support transactions
 
   }
 
   @Override
-  public void rollbackTransaction() {
+  public void rollbackTransaction()
+  {
     // accumulo does not support transactions
 
   }
 
   @Override
-  public boolean isInTransaction() {
+  public boolean isInTransaction()
+  {
     // accumulo does not support transactions
     return false;
   }
 
   @Override
-  public long getCommittedWindowId(String appId, int operatorId) {
+  public long getCommittedWindowId(String appId, int operatorId)
+  {
     byte[] value = null;
     Authorizations auths = new Authorizations();
     Scanner scan = null;
@@ -150,7 +163,8 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
   }
 
   @Override
-  public void storeCommittedWindowId(String appId, int operatorId,long windowId) {
+  public void storeCommittedWindowId(String appId, int operatorId,long windowId)
+  {
     byte[] WindowIdBytes = toBytes(windowId);
     String columnKey = appId + "_" + operatorId + "_" + lastWindowColumnName;
     lastWindowColumnBytes = columnKey.getBytes();
@@ -166,19 +180,19 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
   }
 
   @Override
-  public void removeCommittedWindowId(String appId, int operatorId) {
+  public void removeCommittedWindowId(String appId, int operatorId)
+  {
     // accumulo does not support transactions
-
   }
 
   public static byte[] toBytes(long l)
   {
-    ByteArrayOutputStream baos=new ByteArrayOutputStream(Long.SIZE/8);
-    DataOutputStream dos=new DataOutputStream(baos);
-    byte[] result=null;
+    ByteArrayOutputStream baos = new ByteArrayOutputStream(Long.SIZE / 8);
+    DataOutputStream dos = new DataOutputStream(baos);
+    byte[] result = null;
     try {
       dos.writeLong(l);
-      result=baos.toByteArray();
+      result = baos.toByteArray();
       dos.close();
     } catch (IOException e) {
       logger.error("error converting to byte array");
@@ -187,11 +201,11 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
     return result;
   }
 
-
-  public static long toLong(byte[] b){
-    ByteArrayInputStream baos=new ByteArrayInputStream(b);
-    DataInputStream dos=new DataInputStream(baos);
-    long result=0;
+  public static long toLong(byte[] b)
+  {
+    ByteArrayInputStream baos = new ByteArrayInputStream(b);
+    DataInputStream dos = new DataInputStream(baos);
+    long result = 0;
     try {
       result = dos.readLong();
       dos.close();
@@ -202,5 +216,4 @@ public class AccumuloWindowStore extends AccumuloStore implements Transactionabl
     return result;
   }
 
-
 }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/package-info.java
index cbac406..508c16e 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/package-info.java
@@ -17,4 +17,4 @@
  * under the License.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.accumulo;
+package org.apache.apex.malhar.contrib.accumulo;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeGetOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeGetOperator.java
index 9f7469f..3cc0d69 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeGetOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeGetOperator.java
@@ -16,31 +16,34 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.aerospike;
+package org.apache.apex.malhar.contrib.aerospike;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.apex.malhar.lib.db.AbstractStoreInputOperator;
 
 import com.aerospike.client.Record;
 import com.aerospike.client.query.RecordSet;
 import com.aerospike.client.query.Statement;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.db.AbstractStoreInputOperator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- * Base input adapter, which reads data from persistence database through its API and writes into output port(s).&nsbsp;
- * Subclasses should provide the implementation of getting the tuples and querying to retrieve data.
+ * Base input adapter, which reads data from persistence database through its
+ * API and writes into output port(s). Subclasses should provide the
+ * implementation of getting the tuples and querying to retrieve data.
  * <p>
- * This is an abstract class. Sub-classes need to implement {@link #queryToRetrieveData()} and {@link #getTuple(Record)}.
- * </p>
+ * This is an abstract class. Sub-classes need to implement
+ * {@link #queryToRetrieveData()} and {@link #getTuple(Record)}.
+ *
  * @displayName Abstract Aerospike Get
  * @category Input
  * @tags get
  * @since 1.0.4
  */
-public abstract class AbstractAerospikeGetOperator<T> extends AbstractStoreInputOperator<T, AerospikeStore> {
-
+public abstract class AbstractAerospikeGetOperator<T> extends AbstractStoreInputOperator<T, AerospikeStore>
+{
   private static final Logger logger = LoggerFactory.getLogger(AbstractAerospikeGetOperator.class);
 
   /**
@@ -69,20 +72,19 @@ public abstract class AbstractAerospikeGetOperator<T> extends AbstractStoreInput
    * It then converts each row into tuple and emit that into output port.
    */
   @Override
-  public void emitTuples() {
-
+  public void emitTuples()
+  {
     Statement query = queryToRetrieveData();
     logger.debug(String.format("select statement: %s", query.toString()));
     RecordSet rs;
     try {
       rs = store.getClient().query(null, query);
-      while(rs.next()){
+      while (rs.next()) {
         Record rec = rs.getRecord();
         T tuple = getTuple(rec);
         outputPort.emit(tuple);
       }
-    }
-    catch (Exception ex) {
+    } catch (Exception ex) {
       store.disconnect();
       DTThrowable.rethrow(ex);
     }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
index a629078..ca14a37 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
@@ -16,32 +16,36 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.aerospike;
+package org.apache.apex.malhar.contrib.aerospike;
 
 import java.util.List;
 
+import org.apache.apex.malhar.lib.db.AbstractStoreOutputOperator;
+
 import com.aerospike.client.AerospikeException;
 import com.aerospike.client.Bin;
 import com.aerospike.client.Key;
 import com.google.common.collect.Lists;
 
-import com.datatorrent.lib.db.AbstractStoreOutputOperator;
-
 
 /**
- * <p>
- * Generic base output adaptor which writes tuples as they come without providing any transactional support.&nbsp; Subclasses should provide implementation for getting updated bins.
- * </p>
+ * Generic base output adaptor which writes tuples as they come without
+ * providing any transactional support. Subclasses should provide implementation
+ * for getting updated bins.
+ *
  * @displayName Abstract Aerospike Non Transactional Put
  * @category Output
  * @tags put, non transactional
  * @param <T> type of tuple
  * @since 1.0.4
  */
-public abstract class AbstractAerospikeNonTransactionalPutOperator<T> extends AbstractStoreOutputOperator<T,AerospikeStore> {
+public abstract class AbstractAerospikeNonTransactionalPutOperator<T>
+    extends AbstractStoreOutputOperator<T,AerospikeStore>
+{
+  private final transient List<Bin> bins;
 
-  private transient final List<Bin> bins;
-  public AbstractAerospikeNonTransactionalPutOperator() {
+  public AbstractAerospikeNonTransactionalPutOperator()
+  {
     super();
     bins = Lists.newArrayList();
   }
@@ -58,8 +62,8 @@ public abstract class AbstractAerospikeNonTransactionalPutOperator<T> extends Ab
   protected abstract Key getUpdatedBins(T tuple, List<Bin> bins) throws AerospikeException;
 
   @Override
-  public void processTuple(T tuple) {
-
+  public void processTuple(T tuple)
+  {
     Key key;
     Bin[] binsArray;
     try {
@@ -68,11 +72,9 @@ public abstract class AbstractAerospikeNonTransactionalPutOperator<T> extends Ab
       binsArray = bins.toArray(binsArray);
       store.getClient().put(null, key, binsArray);
       bins.clear();
-    }
-    catch (AerospikeException e) {
+    } catch (AerospikeException e) {
       throw new RuntimeException(e);
     }
-
   }
 
 }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
index 6db8896..9b8ba59 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
@@ -16,39 +16,42 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.aerospike;
+package org.apache.apex.malhar.contrib.aerospike;
 
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.apex.malhar.lib.db.AbstractBatchTransactionableStoreOutputOperator;
+
 import com.aerospike.client.AerospikeException;
 import com.aerospike.client.Bin;
 import com.aerospike.client.Key;
 import com.google.common.collect.Lists;
 
-import com.datatorrent.lib.db.AbstractBatchTransactionableStoreOutputOperator;
-
 /**
+ * Generic base adaptor which creates a transaction at the start of window.
+ * Subclasses should provide implementation for getting updated bins.
  * <p>
- * Generic base adaptor which creates a transaction at the start of window.&nbsp; Subclasses should provide implementation for getting updated bins. <br/>
- * </p>
- * <p>
- * Executes all the put updates and closes the transaction at the end of the window.
- * The tuples in a window are stored in check-pointed collection which is cleared in the endWindow().
- * This is needed for the recovery. The operator writes a tuple at least once in the database, which is why
- * only when all the updates are executed, the transaction is committed in the end window call.
+ * Executes all the put updates and closes the transaction at the end of the
+ * window. The tuples in a window are stored in check-pointed collection which
+ * is cleared in the endWindow(). This is needed for the recovery. The operator
+ * writes a tuple at least once in the database, which is why only when all the
+ * updates are executed, the transaction is committed in the end window call.
  * </p>
+ *
  * @displayName Abstract Aerospike Transactional Put
  * @category Output
  * @tags put, transactional
  * @param <T>type of tuple
  * @since 1.0.4
  */
-public abstract class AbstractAerospikeTransactionalPutOperator<T> extends AbstractBatchTransactionableStoreOutputOperator<T, AerospikeTransactionalStore> {
-
-  private transient final List<Bin> bins;
+public abstract class AbstractAerospikeTransactionalPutOperator<T>
+    extends AbstractBatchTransactionableStoreOutputOperator<T, AerospikeTransactionalStore>
+{
+  private final transient List<Bin> bins;
 
-  public AbstractAerospikeTransactionalPutOperator() {
+  public AbstractAerospikeTransactionalPutOperator()
+  {
     super();
     bins = Lists.newArrayList();
   }
@@ -70,7 +73,7 @@ public abstract class AbstractAerospikeTransactionalPutOperator<T> extends Abstr
     Key key;
     Bin[] binsArray;
     try {
-      for(T tuple: tuples) {
+      for (T tuple: tuples) {
         key = getUpdatedBins(tuple,bins);
         binsArray = new Bin[bins.size()];
         binsArray = bins.toArray(binsArray);
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
index f69e433..49580d0 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.aerospike;
+package org.apache.apex.malhar.contrib.aerospike;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.validation.constraints.NotNull;
 
-import com.aerospike.client.Bin;
-import com.aerospike.client.Key;
-
-import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.Getter;
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Getter;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+
+import com.aerospike.client.Bin;
+import com.aerospike.client.Key;
 
 /**
  * <p>
@@ -47,8 +47,8 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
 @Evolving
 public class AerospikePOJONonTransactionalPutOperator extends AbstractAerospikeNonTransactionalPutOperator<Object>
 {
-  private static transient final Logger LOG
-    = LoggerFactory.getLogger(AerospikePOJONonTransactionalPutOperator.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AerospikePOJONonTransactionalPutOperator.class);
 
   // Two element list; first retrieves the record key and second the list of bins in this tuple
   @NotNull
@@ -91,7 +91,7 @@ public class AerospikePOJONonTransactionalPutOperator extends AbstractAerospikeN
     }
     Key key = keyGetter.get(tuple);
     List<Bin> binList = binsGetter.get(tuple);
-    if ( ! (null == binList || binList.isEmpty()) ) {
+    if (!(null == binList || binList.isEmpty())) {
       list.addAll(binList);
     }
     return key;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
index f59b893..7add642 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
@@ -16,27 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.aerospike;
+package org.apache.apex.malhar.contrib.aerospike;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.validation.constraints.NotNull;
 
-import com.aerospike.client.Bin;
-import com.aerospike.client.Key;
-
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Getter;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.Getter;
+import com.aerospike.client.Bin;
+import com.aerospike.client.Key;
 
 /**
  * <p>
  * A generic implementation of
- * {@link com.datatorrent.contrib.aerospike.AbstractAerospikeTransactionalPutOperator} which can
+ * {@link org.apache.apex.malhar.contrib.aerospike.AbstractAerospikeTransactionalPutOperator} which can
  * take a POJO.
  * </p>
  * @displayName Aerospike Transactional Put Operator
@@ -45,12 +42,8 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
  * @since 2.1.0
  */
 @Evolving
-public class AerospikePOJOTransactionalPutOperator
-  extends AbstractAerospikeTransactionalPutOperator<Object>
+public class AerospikePOJOTransactionalPutOperator extends AbstractAerospikeTransactionalPutOperator<Object>
 {
-  private static transient final Logger LOG
-    = LoggerFactory.getLogger(AerospikePOJOTransactionalPutOperator.class);
-
   // Two element list; first retrieves the record key and second the list of bins in this tuple
   @NotNull
   private ArrayList<String> expressions;
@@ -92,11 +85,10 @@ public class AerospikePOJOTransactionalPutOperator
     }
     Key key = keyGetter.get(tuple);
     List<Bin> binList = binsGetter.get(tuple);
-    if ( ! (null == binList || binList.isEmpty()) ) {
+    if ( !(null == binList || binList.isEmpty()) ) {
       list.addAll(binList);
     }
     return key;
   }
 
-
 }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeStore.java
index 10809e1..2ffda24 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeStore.java
@@ -16,15 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.aerospike;
+package org.apache.apex.malhar.contrib.aerospike;
 
 import javax.validation.constraints.NotNull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.apex.malhar.lib.db.Connectable;
+
 import com.aerospike.client.AerospikeClient;
 import com.aerospike.client.AerospikeException;
 import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.db.Connectable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A {@link Connectable} that uses aerospike to connect to stores and implements Connectable interface.
@@ -34,8 +37,8 @@ import org.slf4j.LoggerFactory;
  * @tags store
  * @since 1.0.4
  */
-public class AerospikeStore implements Connectable {
-
+public class AerospikeStore implements Connectable
+{
   protected static final Logger logger = LoggerFactory.getLogger(AerospikeStore.class);
   private String userName;
   private String password;
@@ -49,7 +52,8 @@ public class AerospikeStore implements Connectable {
    *
    * @param userName user name.
    */
-  public void setUserName(String userName) {
+  public void setUserName(String userName)
+  {
     this.userName = userName;
   }
 
@@ -58,7 +62,8 @@ public class AerospikeStore implements Connectable {
    *
    * @param password password
    */
-  public void setPassword(String password) {
+  public void setPassword(String password)
+  {
     this.password = password;
   }
 
@@ -68,7 +73,8 @@ public class AerospikeStore implements Connectable {
    * @return The node
    */
   @NotNull
-  public String getNode() {
+  public String getNode()
+  {
     return node;
   }
 
@@ -77,7 +83,8 @@ public class AerospikeStore implements Connectable {
    *
    * @param node node
    */
-  public void setNode(@NotNull String node) {
+  public void setNode(@NotNull String node)
+  {
     this.node = node;
   }
 
@@ -86,7 +93,8 @@ public class AerospikeStore implements Connectable {
    *
    * @return The client
    */
-  public AerospikeClient getClient() {
+  public AerospikeClient getClient()
+  {
     return client;
   }
 
@@ -95,7 +103,8 @@ public class AerospikeStore implements Connectable {
    *
    * @param port port
    */
-  public void setPort(int port) {
+  public void setPort(int port)
+  {
     this.port = port;
   }
 
@@ -103,15 +112,14 @@ public class AerospikeStore implements Connectable {
    * Create connection with database.
    */
   @Override
-  public void connect() {
+  public void connect()
+  {
     try {
       client = new AerospikeClient(node, port);
       logger.debug("Aerospike connection Success");
-    }
-    catch (AerospikeException ex) {
+    } catch (AerospikeException ex) {
       throw new RuntimeException("closing database resource", ex);
-    }
-    catch (Throwable t) {
+    } catch (Throwable t) {
       DTThrowable.rethrow(t);
     }
   }
@@ -120,12 +128,14 @@ public class AerospikeStore implements Connectable {
    * Close connection.
    */
   @Override
-  public void disconnect() {
+  public void disconnect()
+  {
     client.close();
   }
 
   @Override
-  public boolean isConnected() {
+  public boolean isConnected()
+  {
     return !client.isConnected();
   }
 }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTransactionalStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTransactionalStore.java
index 8128a17..8f898e6 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTransactionalStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTransactionalStore.java
@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.aerospike;
+package org.apache.apex.malhar.contrib.aerospike;
 
 import javax.annotation.Nonnull;
 
+import org.apache.apex.malhar.lib.db.TransactionableStore;
+
 import com.aerospike.client.AerospikeException;
 import com.aerospike.client.Bin;
 import com.aerospike.client.Key;
@@ -28,7 +30,6 @@ import com.aerospike.client.query.IndexType;
 import com.aerospike.client.query.RecordSet;
 import com.aerospike.client.query.Statement;
 import com.aerospike.client.task.IndexTask;
-import com.datatorrent.lib.db.TransactionableStore;
 
 /**
  * <p>Provides transaction support to the operators by implementing TransactionableStore abstract methods. </p>
@@ -38,8 +39,8 @@ import com.datatorrent.lib.db.TransactionableStore;
  * @tags store, transactional
  * @since 1.0.4
  */
-public class AerospikeTransactionalStore extends AerospikeStore implements TransactionableStore {
-
+public class AerospikeTransactionalStore extends AerospikeStore implements TransactionableStore
+{
   public static String DEFAULT_APP_ID_COL = "dt_app_id";
   public static String DEFAULT_OPERATOR_ID_COL = "dt_operator_id";
   public static String DEFAULT_WINDOW_COL = "dt_window";
@@ -59,8 +60,8 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
   private transient boolean inTransaction;
   private transient Statement lastWindowFetchCommand;
 
-  public AerospikeTransactionalStore() {
-
+  public AerospikeTransactionalStore()
+  {
     super();
     metaSet = DEFAULT_META_SET;
     metaTableAppIdColumn = DEFAULT_APP_ID_COL;
@@ -75,8 +76,8 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
    *
    * @param metaSet meta set name.
    */
-  public void setMetaSet(@Nonnull String metaSet) {
-
+  public void setMetaSet(@Nonnull String metaSet)
+  {
     this.metaSet = metaSet;
   }
 
@@ -86,8 +87,8 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
    *
    * @param appIdColumn application id column name.
    */
-  public void setMetaTableAppIdColumn(@Nonnull String appIdColumn) {
-
+  public void setMetaTableAppIdColumn(@Nonnull String appIdColumn)
+  {
     this.metaTableAppIdColumn = appIdColumn;
   }
 
@@ -97,8 +98,8 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
    *
    * @param operatorIdColumn operator id column name.
    */
-  public void setMetaTableOperatorIdColumn(@Nonnull String operatorIdColumn) {
-
+  public void setMetaTableOperatorIdColumn(@Nonnull String operatorIdColumn)
+  {
     this.metaTableOperatorIdColumn = operatorIdColumn;
   }
 
@@ -108,8 +109,8 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
    *
    * @param windowColumn window column name.
    */
-  public void setMetaTableWindowColumn(@Nonnull String windowColumn) {
-
+  public void setMetaTableWindowColumn(@Nonnull String windowColumn)
+  {
     this.metaTableWindowColumn = windowColumn;
   }
 
@@ -118,14 +119,14 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
    *
    * @param namespace namespace.
    */
-  public void setNamespace(@Nonnull String namespace) {
-
+  public void setNamespace(@Nonnull String namespace)
+  {
     this.namespace = namespace;
   }
 
   @Override
-  public void connect() {
-
+  public void connect()
+  {
     super.connect();
     createIndexes();
     try {
@@ -133,44 +134,43 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
       lastWindowFetchCommand.setNamespace(namespace);
       lastWindowFetchCommand.setSetName(metaSet);
       lastWindowFetchCommand.setBinNames(metaTableWindowColumn);
-    }
-    catch (Exception e) {
+    } catch (Exception e) {
       throw new RuntimeException(e);
     }
   }
 
   @Override
-  public void disconnect() {
-
+  public void disconnect()
+  {
     super.disconnect();
   }
 
   @Override
-  public void beginTransaction() {
-
+  public void beginTransaction()
+  {
     inTransaction = true;
   }
 
   @Override
-  public void commitTransaction() {
-
+  public void commitTransaction()
+  {
     inTransaction = false;
   }
 
   @Override
-  public void rollbackTransaction() {
-
+  public void rollbackTransaction()
+  {
     inTransaction = false;
   }
 
   @Override
-  public boolean isInTransaction() {
-
+  public boolean isInTransaction()
+  {
     return inTransaction;
   }
 
-  private void createIndexes() {
-
+  private void createIndexes()
+  {
     IndexTask task;
     try {
       task = client.createIndex(null, namespace, metaSet,
@@ -186,26 +186,25 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
   }
 
   @Override
-  public long getCommittedWindowId(String appId, int operatorId) {
-
+  public long getCommittedWindowId(String appId, int operatorId)
+  {
     try {
       lastWindowFetchCommand.setFilters(Filter.equal(metaTableOperatorIdColumn, operatorId));
       lastWindowFetchCommand.setFilters(Filter.equal(metaTableAppIdColumn, appId));
       long lastWindow = -1;
       RecordSet recordSet = client.query(null, lastWindowFetchCommand);
-      while(recordSet.next()) {
+      while (recordSet.next()) {
         lastWindow = Long.parseLong(recordSet.getRecord().getValue(metaTableWindowColumn).toString());
       }
       return lastWindow;
-    }
-    catch (AerospikeException ex) {
+    } catch (AerospikeException ex) {
       throw new RuntimeException(ex);
     }
   }
 
   @Override
-  public void storeCommittedWindowId(String appId, int operatorId, long windowId) {
-
+  public void storeCommittedWindowId(String appId, int operatorId, long windowId)
+  {
     try {
       String keyString = appId + String.valueOf(operatorId);
       Key key = new Key(namespace,metaSet,keyString.hashCode());
@@ -213,21 +212,19 @@ public class AerospikeTransactionalStore extends AerospikeStore implements Trans
       Bin bin2 = new Bin(metaTableOperatorIdColumn,operatorId);
       Bin bin3 = new Bin(metaTableWindowColumn,windowId);
       client.put(null, key, bin1,bin2,bin3);
-    }
-    catch (AerospikeException e) {
+    } catch (AerospikeException e) {
       throw new RuntimeException(e);
     }
   }
 
   @Override
-  public void removeCommittedWindowId(String appId, int operatorId) {
-
+  public void removeCommittedWindowId(String appId, int operatorId)
+  {
     try {
       String keyString = appId + String.valueOf(operatorId);
       Key key = new Key(namespace,metaSet,keyString.hashCode());
       client.delete(null, key);
-    }
-    catch (AerospikeException e) {
+    } catch (AerospikeException e) {
       throw new RuntimeException(e);
     }
   }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/package-info.java
index 97e878c..8a37041 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/package-info.java
@@ -17,4 +17,4 @@
  * under the License.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.aerospike;
+package org.apache.apex.malhar.contrib.aerospike;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGenerator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGenerator.java
index ecd57aa..7f44cc9 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGenerator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGenerator.java
@@ -16,18 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.apachelog;
-
-import com.datatorrent.api.*;
-import com.datatorrent.api.Context.OperatorContext;
-import java.io.*;
+package org.apache.apex.malhar.contrib.apachelog;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+import java.util.StringTokenizer;
 import java.util.concurrent.ArrayBlockingQueue;
 import javax.validation.constraints.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.datatorrent.api.Context.OperatorContext;
+import com.datatorrent.api.DefaultOutputPort;
+import com.datatorrent.api.InputOperator;
+import com.datatorrent.api.Operator;
+
 /**
  * An implementation of input operator and activation listener that simulates the apache logs.
  * <p>
@@ -38,7 +50,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ApacheLogInputGenerator implements InputOperator, Operator.ActivationListener<OperatorContext>
 {
-  private final static String delimiter = ";";
+  private static final String delimiter = ";";
 
   private transient Random random;
   private transient int ipAddressCount;
@@ -99,13 +111,12 @@ public class ApacheLogInputGenerator implements InputOperator, Operator.Activati
 
   private List<String> readLines(String file) throws IOException
   {
-    List<String> lines = new ArrayList<String>();
+    List<String> lines = new ArrayList<>();
     InputStream in;
     File f = new File(file);
     if (f.exists()) {
       in = new FileInputStream(f);
-    }
-    else {
+    } else {
       in = getClass().getResourceAsStream(file);
     }
     BufferedReader br = new BufferedReader(new InputStreamReader(in));
@@ -114,8 +125,7 @@ public class ApacheLogInputGenerator implements InputOperator, Operator.Activati
       while ((line = br.readLine()) != null) {
         lines.add(line);
       }
-    }
-    finally {
+    } finally {
       br.close();
     }
     return lines;
@@ -150,8 +160,7 @@ public class ApacheLogInputGenerator implements InputOperator, Operator.Activati
         bytes.add(Integer.parseInt(token.nextToken().trim()));
         status.add(Integer.parseInt(token.nextToken().trim()));
       }
-    }
-    catch (IOException e) {
+    } catch (IOException e) {
       throw new RuntimeException(e);
     }
 
@@ -214,8 +223,7 @@ public class ApacheLogInputGenerator implements InputOperator, Operator.Activati
           if (maxDelay > 0) {
             try {
               Thread.sleep(random.nextInt(maxDelay));
-            }
-            catch (InterruptedException e) {
+            } catch (InterruptedException e) {
               return;
             }
           }
@@ -232,8 +240,8 @@ public class ApacheLogInputGenerator implements InputOperator, Operator.Activati
     try {
       thread.interrupt();
       thread.join();
-    }
-    catch (InterruptedException ex) {
+    } catch (InterruptedException ex) {
+      // ignore
     }
   }
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLog.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLog.java
index 23b4a62..b8d29d4 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLog.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLog.java
@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.apachelog;
+package org.apache.apex.malhar.contrib.apachelog;
+
+import org.apache.apex.malhar.lib.io.ConsoleOutputOperator;
+import org.apache.apex.malhar.lib.io.fs.TailFsInputOperator;
+import org.apache.apex.malhar.lib.logs.ApacheLogParseMapOutputOperator;
+import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
 import com.datatorrent.api.StreamingApplication;
-import com.datatorrent.lib.io.ConsoleOutputOperator;
-import com.datatorrent.lib.io.fs.TailFsInputOperator;
-import com.datatorrent.lib.logs.ApacheLogParseMapOutputOperator;
-import org.apache.hadoop.conf.Configuration;
 
 /**
  * An implementation of Streaming Application that reads from a local apache log file on the fly and dumps the parsed data to output.
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGenerator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGenerator.java
index d624e08..0eef6dc 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGenerator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGenerator.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.apachelog;
+package org.apache.apex.malhar.contrib.apachelog;
 
-import com.datatorrent.api.*;
-import com.datatorrent.api.DAG.Locality;
-import com.datatorrent.lib.io.ConsoleOutputOperator;
-import com.datatorrent.lib.logs.ApacheLogParseMapOutputOperator;
-import java.util.ArrayList;
-import java.util.List;
+import org.apache.apex.malhar.lib.io.ConsoleOutputOperator;
+import org.apache.apex.malhar.lib.logs.ApacheLogParseMapOutputOperator;
 import org.apache.hadoop.conf.Configuration;
 
+import com.datatorrent.api.DAG;
+import com.datatorrent.api.DAG.Locality;
+import com.datatorrent.api.StreamingApplication;
+
 /**
  * An implementation of Streaming Application that generates apache log file on the fly and dumps the parsed data to output.
  *
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/GeoIPExtractor.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/GeoIPExtractor.java
index bd226e3..a58c39e 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/GeoIPExtractor.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/GeoIPExtractor.java
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.apachelog;
+package org.apache.apex.malhar.contrib.apachelog;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.io.IOException;
 import javax.validation.constraints.NotNull;
 
-import com.datatorrent.lib.logs.InformationExtractor;
-import com.maxmind.geoip.Location;
-import com.maxmind.geoip.LookupService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.apex.malhar.lib.logs.InformationExtractor;
+
+import com.maxmind.geoip.Location;
+import com.maxmind.geoip.LookupService;
 
 /**
  * An implementation of InformationExtractor that extracts Geo information from an IP address using maxmind API .
@@ -67,8 +67,7 @@ public class GeoIPExtractor implements InformationExtractor
   {
     try {
       reader = new LookupService(databasePath, LookupService.GEOIP_MEMORY_CACHE | LookupService.GEOIP_CHECK_CACHE);
-    }
-    catch (IOException ex) {
+    } catch (IOException ex) {
       throw new RuntimeException(ex);
     }
   }
@@ -90,8 +89,7 @@ public class GeoIPExtractor implements InformationExtractor
         m.put("ipRegion", location.region);
         m.put("ipCity", location.city);
       }
-    }
-    catch (Exception ex) {
+    } catch (Exception ex) {
       LOG.error("Caught exception when looking up Geo IP for {}:", value, ex);
     }
     return m;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/TimestampExtractor.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/TimestampExtractor.java
index bb87f03..1b6b4b6 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/TimestampExtractor.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/TimestampExtractor.java
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.apachelog;
+package org.apache.apex.malhar.contrib.apachelog;
 
-import java.util.Map;
-
-import com.datatorrent.lib.logs.InformationExtractor;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Map;
 import javax.validation.constraints.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.logs.InformationExtractor;
+
 /**
  * An implementation of InformationExtractor that extracts the time stamp in milliseconds from epoch from an arbitrary date string.
  * <p>
@@ -69,8 +69,7 @@ public class TimestampExtractor implements InformationExtractor
     try {
       Date date = dateFormat.parse((String)value);
       m.put("timestamp", date.getTime());
-    }
-    catch (ParseException ex) {
+    } catch (ParseException ex) {
       LOG.error("Error parsing \"{}\" to timestamp using \"{}\":", value, dateFormatString, ex);
     }
     return m;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/UserAgentExtractor.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/UserAgentExtractor.java
index f73ff3d..799eb48 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/UserAgentExtractor.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/UserAgentExtractor.java
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.apachelog;
+package org.apache.apex.malhar.contrib.apachelog;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.apex.malhar.lib.logs.InformationExtractor;
 
-import com.datatorrent.lib.logs.InformationExtractor;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 
-import java.util.concurrent.TimeUnit;
-
 import net.sf.uadetector.ReadableUserAgent;
-import net.sf.uadetector.service.UADetectorServiceFactory;
 import net.sf.uadetector.UserAgentStringParser;
+import net.sf.uadetector.service.UADetectorServiceFactory;
 
 /**
  * An implementation of Information Extractor that extracts the browser and the OS from a user-agent string.
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/package-info.java
index d99c7b5..67b151b 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/package-info.java
@@ -20,4 +20,4 @@
  * Apache log application, operators, and utilities.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.apachelog;
+package org.apache.apex.malhar.contrib.apachelog;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/zmq/Application.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/zmq/Application.java
index 738a146..e44c97a 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/zmq/Application.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/zmq/Application.java
@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.apachelog.zmq;
+package org.apache.apex.malhar.contrib.apachelog.zmq;
 
 
+import org.apache.apex.malhar.contrib.zmq.SimpleSinglePortZeroMQPullStringInputOperator;
+import org.apache.apex.malhar.lib.algo.UniqueCounter;
+import org.apache.apex.malhar.lib.io.ConsoleOutputOperator;
+import org.apache.apex.malhar.lib.logs.ApacheLogParseOperator;
+import org.apache.apex.malhar.lib.math.Sum;
 import org.apache.hadoop.conf.Configuration;
 
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.DAG.Locality;
-import com.datatorrent.api.annotation.ApplicationAnnotation;
 import com.datatorrent.api.StreamingApplication;
-import com.datatorrent.contrib.zmq.SimpleSinglePortZeroMQPullStringInputOperator;
-import com.datatorrent.lib.algo.UniqueCounter;
-import com.datatorrent.lib.io.ConsoleOutputOperator;
-import com.datatorrent.lib.logs.ApacheLogParseOperator;
-import com.datatorrent.lib.math.Sum;
+import com.datatorrent.api.annotation.ApplicationAnnotation;
 
 /**
  * <p>An implementation of Streaming Application that populates the DAG. </p>
@@ -40,7 +40,7 @@ import com.datatorrent.lib.math.Sum;
  * @tag: streaming
  * @since 0.3.2
  */
-@ApplicationAnnotation(name="ApacheLog")
+@ApplicationAnnotation(name = "ApacheLog")
 public class Application implements StreamingApplication
 {
   private Locality locality = null;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperator.java
index f863d41..52200fe 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.avro;
+package org.apache.apex.malhar.contrib.avro;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,6 +24,7 @@ import java.io.InputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.io.fs.AbstractFileInputOperator;
 import org.apache.apex.malhar.lib.wal.FSWindowDataManager;
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.file.DataFileStream;
@@ -37,7 +38,6 @@ import com.google.common.annotations.VisibleForTesting;
 
 import com.datatorrent.api.AutoMetric;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.lib.io.fs.AbstractFileInputOperator;
 
 /**
  * <p>
diff --git a/contrib/src/main/java/com/datatorrent/contrib/avro/AvroFileToPojoModule.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileToPojoModule.java
similarity index 98%
rename from contrib/src/main/java/com/datatorrent/contrib/avro/AvroFileToPojoModule.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileToPojoModule.java
index 8ad00df..4637b8f 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/avro/AvroFileToPojoModule.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileToPojoModule.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.avro;
+package org.apache.apex.malhar.contrib.avro;
 
 import org.apache.apex.malhar.lib.wal.FSWindowDataManager;
 import org.apache.avro.generic.GenericRecord;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroRecordHelper.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroRecordHelper.java
index 012e977..176f5eb 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroRecordHelper.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroRecordHelper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.avro;
+package org.apache.apex.malhar.contrib.avro;
 
 import java.text.ParseException;
 import java.util.List;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroToPojo.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroToPojo.java
index 2acf98c..5539562 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroToPojo.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroToPojo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.avro;
+package org.apache.apex.malhar.contrib.avro;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +25,9 @@ import java.util.StringTokenizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.util.FieldInfo;
+import org.apache.apex.malhar.lib.util.FieldInfo.SupportType;
+import org.apache.apex.malhar.lib.util.PojoUtils;
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.commons.lang3.ClassUtils;
@@ -40,9 +43,6 @@ import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.common.util.BaseOperator;
-import com.datatorrent.lib.util.FieldInfo;
-import com.datatorrent.lib.util.FieldInfo.SupportType;
-import com.datatorrent.lib.util.PojoUtils;
 
 /**
  * <p>
@@ -87,7 +87,7 @@ public class AvroToPojo extends BaseOperator
   @AutoMetric
   @VisibleForTesting
   int fieldErrorCount = 0;
-  
+
   public final transient DefaultOutputPort<GenericRecord> errorPort = new DefaultOutputPort<GenericRecord>();
 
   /**
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/PojoToAvro.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/PojoToAvro.java
index 41c56e3..17a4ecc 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/PojoToAvro.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/PojoToAvro.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.avro;
+package org.apache.apex.malhar.contrib.avro;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -25,6 +25,8 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Getter;
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Field;
@@ -42,8 +44,6 @@ import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.common.util.BaseOperator;
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.Getter;
 
 /**
  * <p>
@@ -63,7 +63,6 @@ import com.datatorrent.lib.util.PojoUtils.Getter;
 @InterfaceStability.Evolving
 public class PojoToAvro extends BaseOperator
 {
-
   private List<Field> columnNames;
 
   private Class<?> cls;
@@ -155,7 +154,7 @@ public class PojoToAvro extends BaseOperator
    * @return Getter
    */
   private Getter<?, ?> generateGettersForField(Class<?> cls, String inputFieldName)
-      throws NoSuchFieldException, SecurityException
+    throws NoSuchFieldException, SecurityException
   {
     java.lang.reflect.Field f = cls.getDeclaredField(inputFieldName);
     Class<?> c = ClassUtils.primitiveToWrapper(f.getType());
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraInputOperator.java
index 7bd47fc..3153387 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraInputOperator.java
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.apex.malhar.lib.db.AbstractStoreInputOperator;
 
 import com.datastax.driver.core.PagingState;
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.SimpleStatement;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.datatorrent.lib.db.AbstractStoreInputOperator;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.netlet.util.DTThrowable;
 
@@ -43,8 +43,8 @@ import com.datatorrent.netlet.util.DTThrowable;
  * @tags cassandra
  * @since 1.0.2
  */
-public abstract class AbstractCassandraInputOperator<T> extends AbstractStoreInputOperator<T, CassandraStore> {
-
+public abstract class AbstractCassandraInputOperator<T> extends AbstractStoreInputOperator<T, CassandraStore>
+{
   private static final Logger logger = LoggerFactory.getLogger(AbstractCassandraInputOperator.class);
   private PagingState nextPageState;
   private int fetchSize;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
index 9048383..f0f590d 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
@@ -16,12 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 import java.util.Collection;
 
 import javax.annotation.Nonnull;
 
+import org.apache.apex.malhar.lib.db.AbstractBatchTransactionableStoreOutputOperator;
+
 import com.datastax.driver.core.BatchStatement;
 import com.datastax.driver.core.PreparedStatement;
 import com.datastax.driver.core.Statement;
@@ -29,7 +31,6 @@ import com.datastax.driver.core.exceptions.DriverException;
 import com.datatorrent.api.Context;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.Operator.ActivationListener;
-import com.datatorrent.lib.db.AbstractBatchTransactionableStoreOutputOperator;
 
 /**
  * <p>
@@ -86,8 +87,7 @@ public abstract class AbstractCassandraTransactionableOutputOperator<T> extends
   public void processBatch(Collection<T> tuples)
   {
     BatchStatement batchCommand = store.getBatchCommand();
-    for(T tuple: tuples)
-    {
+    for (T tuple: tuples) {
       batchCommand.add(setStatementParameters(updateCommand, tuple));
     }
   }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperator.java
index f287385..cadf157 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -949,7 +949,7 @@ public abstract class AbstractUpsertOutputOperator extends BaseOperator implemen
 
   /**
    * Implementing concrete Operator instances define the Connection Builder properties by implementing this method
-   * Please refer to {@link com.datatorrent.contrib.cassandra.ConnectionStateManager.ConnectionBuilder} for
+   * Please refer to {@link org.apache.apex.malhar.contrib.cassandra.ConnectionStateManager.ConnectionBuilder} for
    * an example implementation of the ConnectionStateManager instantiation.
    * Note that if this method is returning null, the connection properties are
    * fetched from a properties file loaded from the classpath.
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOInputOperator.java
index f43777f..cab83e8 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOInputOperator.java
@@ -16,17 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
-import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.apex.malhar.lib.util.FieldInfo;
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Setter;
+import org.apache.apex.malhar.lib.util.PojoUtils.SetterBoolean;
+import org.apache.apex.malhar.lib.util.PojoUtils.SetterDouble;
+import org.apache.apex.malhar.lib.util.PojoUtils.SetterFloat;
+import org.apache.apex.malhar.lib.util.PojoUtils.SetterInt;
+import org.apache.apex.malhar.lib.util.PojoUtils.SetterLong;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
 
 import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.ColumnDefinitions;
@@ -39,9 +52,6 @@ import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.Operator;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
-import com.datatorrent.lib.util.FieldInfo;
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.*;
 
 /**
  * <p>
@@ -287,8 +297,7 @@ public class CassandraPOJOInputOperator extends AbstractCassandraInputOperator<O
     try {
       // This code will be replaced after integration of creating POJOs on the fly utility.
       obj = pojoClass.newInstance();
-    }
-    catch (InstantiationException | IllegalAccessException ex) {
+    } catch (InstantiationException | IllegalAccessException ex) {
       throw new RuntimeException(ex);
     }
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOOutputOperator.java
index a191bb0..5f7d52a 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOOutputOperator.java
@@ -16,28 +16,44 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
-import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Lists;
-import com.datastax.driver.core.*;
+import org.apache.apex.malhar.lib.util.FieldInfo;
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Getter;
+import org.apache.apex.malhar.lib.util.PojoUtils.GetterBoolean;
+import org.apache.apex.malhar.lib.util.PojoUtils.GetterDouble;
+import org.apache.apex.malhar.lib.util.PojoUtils.GetterFloat;
+import org.apache.apex.malhar.lib.util.PojoUtils.GetterInt;
+import org.apache.apex.malhar.lib.util.PojoUtils.GetterLong;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+
+import com.datastax.driver.core.BoundStatement;
+import com.datastax.driver.core.ColumnDefinitions;
+import com.datastax.driver.core.DataType;
+import com.datastax.driver.core.LocalDate;
+import com.datastax.driver.core.PreparedStatement;
+import com.datastax.driver.core.Statement;
 import com.datastax.driver.core.exceptions.DriverException;
+import com.google.common.collect.Lists;
 import com.datatorrent.api.AutoMetric;
 import com.datatorrent.api.Context;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
-import com.datatorrent.lib.util.FieldInfo;
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.*;
 
 /**
  * <p>
@@ -106,10 +122,11 @@ public class CassandraPOJOOutputOperator extends AbstractCassandraTransactionabl
   @Override
   public void activate(Context.OperatorContext context)
   {
-    com.datastax.driver.core.ResultSet rs = store.getSession().execute("select * from " + store.keyspace + "." + tablename);
+    com.datastax.driver.core.ResultSet rs
+        = store.getSession().execute("select * from " + store.keyspace + "." + tablename);
     final ColumnDefinitions rsMetaData = rs.getColumnDefinitions();
 
-    if(fieldInfos == null) {
+    if (fieldInfos == null) {
       populateFieldInfosFromPojo(rsMetaData);
     }
 
@@ -228,13 +245,12 @@ public class CassandraPOJOOutputOperator extends AbstractCassandraTransactionabl
       }
     }
     String statement
-            = "INSERT INTO " + store.keyspace + "."
-            + tablename
-            + " (" + queryfields.toString() + ") "
-            + "VALUES (" + values.toString() + ");";
+        = "INSERT INTO " + store.keyspace + "."
+        + tablename
+        + " (" + queryfields.toString() + ") "
+        + "VALUES (" + values.toString() + ");";
     LOG.debug("statement is {}", statement);
     return store.getSession().prepare(statement);
-
   }
 
   @Override
@@ -316,6 +332,7 @@ public class CassandraPOJOOutputOperator extends AbstractCassandraTransactionabl
       errorRecords++;
     }
   }
+
   /**
    * A list of {@link FieldInfo}s where each item maps a column name to a pojo field name.
    */
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPojoUtils.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPojoUtils.java
index 8b435c9..179ac1a 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPojoUtils.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPojoUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -25,11 +25,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+import org.apache.apex.malhar.lib.util.PojoUtils;
+
 import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.DataType;
 import com.datastax.driver.core.LocalDate;
 import com.datastax.driver.core.TypeCodec;
-import com.datatorrent.lib.util.PojoUtils;
 
 /**
  * Used to manage simple data type based getters for given cassandra columns
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPreparedStatementGenerator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPreparedStatementGenerator.java
index 713179c..a797bab 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPreparedStatementGenerator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPreparedStatementGenerator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 
 import java.util.EnumSet;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraStore.java
index 5d9178c..0c298aa 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraStore.java
@@ -16,19 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 import javax.validation.constraints.NotNull;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.db.Connectable;
+
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.ProtocolVersion;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.exceptions.DriverException;
 import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.db.Connectable;
 
 /**
  * A {@link Connectable} that uses cassandra to connect to stores and implements Connectable interface.
@@ -67,7 +68,8 @@ public class CassandraStore implements Connectable
    *
    * @param keyspace keyspace.
    */
-  public void setKeyspace(String keyspace) {
+  public void setKeyspace(String keyspace)
+  {
     this.keyspace = keyspace;
   }
 
@@ -106,7 +108,8 @@ public class CassandraStore implements Connectable
   }
 
   @NotNull
-  public String getNode() {
+  public String getNode()
+  {
     return node;
   }
 
@@ -115,15 +118,18 @@ public class CassandraStore implements Connectable
    *
    * @param node node
    */
-  public void setNode(@NotNull String node) {
+  public void setNode(@NotNull String node)
+  {
     this.node = node;
   }
 
-  public Cluster getCluster() {
+  public Cluster getCluster()
+  {
     return cluster;
   }
 
-  public Session getSession() {
+  public Session getSession()
+  {
     return session;
   }
 
@@ -167,20 +173,18 @@ public class CassandraStore implements Connectable
   public void connect()
   {
     try {
-      if(cluster==null)
+      if (cluster == null) {
         buildCluster();
+      }
       session = cluster.connect();
       logger.debug("Cassandra connection Success");
-    }
-    catch (DriverException ex) {
+    } catch (DriverException ex) {
       throw new RuntimeException("closing database resource", ex);
-    }
-    catch (Throwable t) {
+    } catch (Throwable t) {
       DTThrowable.rethrow(t);
     }
   }
 
-
   /**
    * Close connection.
    */
@@ -190,11 +194,9 @@ public class CassandraStore implements Connectable
     try {
       session.close();
       cluster.close();
-    }
-    catch (DriverException ex) {
+    } catch (DriverException ex) {
       throw new RuntimeException("closing database resource", ex);
-    }
-    catch (Throwable t) {
+    } catch (Throwable t) {
       DTThrowable.rethrow(t);
     }
   }
@@ -204,8 +206,7 @@ public class CassandraStore implements Connectable
   {
     try {
       return !session.isClosed();
-    }
-    catch (DriverException ex) {
+    } catch (DriverException ex) {
       throw new RuntimeException("closing database resource", ex);
     }
   }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraTransactionalStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraTransactionalStore.java
index 4c5a71e..29b6ce9 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraTransactionalStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraTransactionalStore.java
@@ -16,14 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 import javax.annotation.Nonnull;
 
-import com.datastax.driver.core.*;
-import com.datastax.driver.core.exceptions.DriverException;
+import org.apache.apex.malhar.lib.db.TransactionableStore;
 
-import com.datatorrent.lib.db.TransactionableStore;
+import com.datastax.driver.core.BatchStatement;
+import com.datastax.driver.core.BoundStatement;
+import com.datastax.driver.core.PreparedStatement;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Statement;
+import com.datastax.driver.core.exceptions.DriverException;
 
 /**
  * <p>Provides transaction support to the operators by implementing TransactionableStore abstract methods. </p>
@@ -34,8 +38,8 @@ import com.datatorrent.lib.db.TransactionableStore;
  * @tags cassandra, transactional
  * @since 1.0.2
  */
-public class CassandraTransactionalStore extends CassandraStore implements TransactionableStore {
-
+public class CassandraTransactionalStore extends CassandraStore implements TransactionableStore
+{
   public static String DEFAULT_APP_ID_COL = "dt_app_id";
   public static String DEFAULT_OPERATOR_ID_COL = "dt_operator_id";
   public static String DEFAULT_WINDOW_COL = "dt_window";
@@ -116,7 +120,8 @@ public class CassandraTransactionalStore extends CassandraStore implements Trans
     this.metaTableWindowColumn = windowColumn;
   }
 
-  public Statement getLastWindowUpdateStatement() {
+  public Statement getLastWindowUpdateStatement()
+  {
     return lastWindowUpdateStatement;
   }
 
@@ -130,26 +135,24 @@ public class CassandraTransactionalStore extends CassandraStore implements Trans
   {
     super.connect();
     try {
-      String command = "SELECT " + metaTableWindowColumn + " FROM " + keyspace +"."+ metaTable + " WHERE " + metaTableAppIdColumn +
+      String command = "SELECT " + metaTableWindowColumn + " FROM " + keyspace + "." + metaTable +
+          " WHERE " + metaTableAppIdColumn +
           " = ? AND " + metaTableOperatorIdColumn + " = ?";
       logger.debug(command);
       lastWindowFetchCommand = session.prepare(command);
 
-      command = "UPDATE " + keyspace +"."+ metaTable + " SET " + metaTableWindowColumn + " = ? where " + metaTableAppIdColumn + " = ? " +
+      command = "UPDATE " + keyspace + "." + metaTable + " SET " + metaTableWindowColumn + " = ? where " + metaTableAppIdColumn + " = ? " +
           " and " + metaTableOperatorIdColumn + " = ?";
       logger.debug(command);
       lastWindowUpdateCommand = session.prepare(command);
 
-      command = "DELETE FROM " + keyspace +"."+ metaTable + " where " + metaTableAppIdColumn + " = ? and " +
+      command = "DELETE FROM " + keyspace + "." + metaTable + " where " + metaTableAppIdColumn + " = ? and " +
           metaTableOperatorIdColumn + " = ?";
       logger.debug(command);
       lastWindowDeleteCommand = session.prepare(command);
-    }
-    catch (DriverException e) {
+    } catch (DriverException e) {
       throw new RuntimeException(e);
-    }
-    catch (Exception e)
-    {
+    } catch (Exception e) {
       throw new RuntimeException(e);
     }
   }
@@ -160,8 +163,7 @@ public class CassandraTransactionalStore extends CassandraStore implements Trans
     if (lastWindowUpdateCommand != null) {
       try {
         lastWindowUpdateCommand.disableTracing();
-      }
-      catch (DriverException e) {
+      } catch (DriverException e) {
         throw new RuntimeException(e);
       }
     }
@@ -208,8 +210,7 @@ public class CassandraTransactionalStore extends CassandraStore implements Trans
       }
       lastWindowFetchCommand.disableTracing();
       return lastWindow;
-    }
-    catch (DriverException ex) {
+    } catch (DriverException ex) {
       throw new RuntimeException(ex);
     }
   }
@@ -221,8 +222,7 @@ public class CassandraTransactionalStore extends CassandraStore implements Trans
       BoundStatement boundStatement = new BoundStatement(lastWindowUpdateCommand);
       lastWindowUpdateStatement = boundStatement.bind(windowId,appId,operatorId);
       batchCommand.add(lastWindowUpdateStatement);
-    }
-    catch (DriverException e) {
+    } catch (DriverException e) {
       throw new RuntimeException(e);
     }
   }
@@ -235,8 +235,7 @@ public class CassandraTransactionalStore extends CassandraStore implements Trans
       lastWindowDeleteStatement = boundStatement.bind(appId,operatorId);
       session.execute(lastWindowDeleteStatement);
       lastWindowDeleteCommand.disableTracing();
-    }
-    catch (DriverException e) {
+    } catch (DriverException e) {
       throw new RuntimeException(e);
     }
   }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/ConnectionStateManager.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/ConnectionStateManager.java
index f089137..0eccb22 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/ConnectionStateManager.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/ConnectionStateManager.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -64,7 +64,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * </p>
  * <p> A typical implementation of the ConnectionBuilder would like this:
  * <pre>
- *     
+ *
  *     public ConnectionStateManager.ConnectionBuilder withConnectionBuilder()
  *     {
  *       return ConnectionStateManager.withNewBuilder()
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/UpsertExecutionContext.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/UpsertExecutionContext.java
index 92be546..10ffb08 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/UpsertExecutionContext.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/UpsertExecutionContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
 
 import com.datastax.driver.core.ConsistencyLevel;
 
@@ -122,7 +122,7 @@ public class UpsertExecutionContext<T>
 
   /**
    * This decides if we want to override the default TTL if at all set in the
-   * {@link com.datatorrent.contrib.cassandra.ConnectionStateManager.ConnectionBuilder} that is used to execute a
+   * {@link org.apache.apex.malhar.contrib.cassandra.ConnectionStateManager.ConnectionBuilder} that is used to execute a
    * mutation. Note that TTLs are not mandatory for mutations.
    * Also it is supported to have TTLs only for the current execution context but not set a default at the
    * connection state manager level
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/package-info.java
index 1baae5e..93c5518 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/package-info.java
@@ -17,4 +17,4 @@
  * under the License.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.cassandra;
+package org.apache.apex.malhar.contrib.cassandra;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseInputOperator.java
index 1cd4eb5..3c53a49 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseInputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -24,21 +24,20 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.apex.malhar.lib.db.AbstractStoreInputOperator;
+import org.apache.apex.malhar.lib.util.KryoCloneUtils;
+
 import com.couchbase.client.CouchbaseClient;
 import com.couchbase.client.vbucket.config.Config;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.datatorrent.lib.db.AbstractStoreInputOperator;
-
 import com.datatorrent.api.Context;
 import com.datatorrent.api.DefaultPartition;
 import com.datatorrent.api.Partitioner;
-
-import com.datatorrent.lib.util.KryoCloneUtils;
 import com.datatorrent.netlet.util.DTThrowable;
 
 /**
@@ -94,8 +93,7 @@ public abstract class AbstractCouchBaseInputOperator<T> extends AbstractStoreInp
       }
       try {
         clientPartition = store.connectServer(serverURIString);
-      }
-      catch (IOException ex) {
+      } catch (IOException ex) {
         DTThrowable.rethrow(ex);
       }
     }
@@ -116,16 +114,16 @@ public abstract class AbstractCouchBaseInputOperator<T> extends AbstractStoreInp
     List<String> keys = getKeys();
     Object result = null;
     for (String key: keys) {
-        int master = conf.getMaster(conf.getVbucketByKey(key));
-        if (master == getServerIndex()) {
-          result = clientPartition.get(key);
-        }
+      int master = conf.getMaster(conf.getVbucketByKey(key));
+      if (master == getServerIndex()) {
+        result = clientPartition.get(key);
       }
+    }
 
-      if (result != null) {
-        T tuple = getTuple(result);
-        outputPort.emit(tuple);
-      }
+    if (result != null) {
+      T tuple = getTuple(result);
+      outputPort.emit(tuple);
+    }
   }
 
   public abstract T getTuple(Object object);
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseOutputOperator.java
index ef3be01..8cc92f2 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseOutputOperator.java
@@ -16,23 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.TreeMap;
-import net.spy.memcached.internal.OperationCompletionListener;
-import net.spy.memcached.internal.OperationFuture;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.datatorrent.lib.db.AbstractAggregateTransactionableStoreOutputOperator;
+import org.apache.apex.malhar.lib.db.AbstractAggregateTransactionableStoreOutputOperator;
 
 import com.datatorrent.api.Context.OperatorContext;
-
 import com.datatorrent.netlet.util.DTThrowable;
 
+import net.spy.memcached.internal.OperationCompletionListener;
+import net.spy.memcached.internal.OperationFuture;
+
+
 /**
  * AbstractCouchBaseOutputOperator which extends Transactionable Store Output Operator.
  * Classes extending from this operator should implement the abstract functionality of generateKey, getValue and insertOrUpdate.
@@ -108,10 +109,10 @@ public abstract class AbstractCouchBaseOutputOperator<T> extends AbstractAggrega
     id++;
     String key = getKey(tuple);
     Object value = getValue(tuple);
-    if(!(value instanceof Boolean) && !(value instanceof Integer) && !(value instanceof String) && !(value instanceof Float) && !(value instanceof Double) && !(value instanceof Character) && !(value instanceof Long) && !(value instanceof Short) && !(value instanceof Byte)){
-    if (serializer != null) {
-      value = serializer.serialize(value);
-    }
+    if (!(value instanceof Boolean) && !(value instanceof Integer) && !(value instanceof String) && !(value instanceof Float) && !(value instanceof Double) && !(value instanceof Character) && !(value instanceof Long) && !(value instanceof Short) && !(value instanceof Byte)) {
+      if (serializer != null) {
+        value = serializer.serialize(value);
+      }
     }
     OperationFuture<Boolean> future = processKeyValue(key, value);
     synchronized (syncObj) {
@@ -135,7 +136,7 @@ public abstract class AbstractCouchBaseOutputOperator<T> extends AbstractAggrega
   public void waitForQueueSize(int sizeOfQueue)
   {
     long startTms = System.currentTimeMillis();
-    long elapsedTime ;
+    long elapsedTime;
     while (numTuples > sizeOfQueue) {
       synchronized (syncObj) {
         if (numTuples > sizeOfQueue) {
@@ -143,12 +144,10 @@ public abstract class AbstractCouchBaseOutputOperator<T> extends AbstractAggrega
             elapsedTime = System.currentTimeMillis() - startTms;
             if (elapsedTime >= store.timeout) {
               throw new RuntimeException("Timed out waiting for space in queue");
-            }
-            else {
+            } else {
               syncObj.wait(store.timeout - elapsedTime);
             }
-          }
-          catch (InterruptedException ex) {
+          } catch (InterruptedException ex) {
             DTThrowable.rethrow(ex);
           }
         }
@@ -167,7 +166,7 @@ public abstract class AbstractCouchBaseOutputOperator<T> extends AbstractAggrega
     public void onComplete(OperationFuture<?> f) throws Exception
     {
       if (!((Boolean)f.get())) {
-        logger.error("Operation failed {}" , f);
+        logger.error("Operation failed {}", f);
         failure = true;
         return;
       }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseSetOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseSetOperator.java
index f33d804..0abe06f 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseSetOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseSetOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
 
 import net.spy.memcached.internal.OperationFuture;
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseJSONSerializer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseJSONSerializer.java
index 188d989..0f968bd 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseJSONSerializer.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseJSONSerializer.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
 
-import com.datatorrent.netlet.util.DTThrowable;
 import java.io.IOException;
 import org.codehaus.jackson.map.ObjectMapper;
+import com.datatorrent.netlet.util.DTThrowable;
 
 /**
  * <p>CouchBaseJSONSerializer</p>
@@ -43,8 +43,7 @@ public class CouchBaseJSONSerializer implements CouchBaseSerializer
     String value = null;
     try {
       value = mapper.writeValueAsString(o);
-    }
-    catch (IOException ex) {
+    } catch (IOException ex) {
       DTThrowable.rethrow(ex);
     }
     return value;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOInputOperator.java
index 2378aec..91e3b17 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOInputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -24,12 +24,16 @@ import java.util.Iterator;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
-import com.couchbase.client.protocol.views.*;
-
-import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.apache.apex.malhar.lib.db.AbstractStoreInputOperator;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
+
+import com.couchbase.client.protocol.views.Query;
+import com.couchbase.client.protocol.views.Stale;
+import com.couchbase.client.protocol.views.View;
+import com.couchbase.client.protocol.views.ViewResponse;
+import com.couchbase.client.protocol.views.ViewRow;
 
-import com.datatorrent.lib.db.AbstractStoreInputOperator;
 import com.datatorrent.api.Context.OperatorContext;
 
 /**
@@ -167,8 +171,7 @@ public class CouchBasePOJOInputOperator extends AbstractStoreInputOperator<Objec
     super.setup(context);
     try {
       className = Class.forName(outputClass);
-    }
-    catch (ClassNotFoundException ex) {
+    } catch (ClassNotFoundException ex) {
       throw new RuntimeException(ex);
     }
     view = store.getInstance().getView(designDocumentName, viewName);
@@ -198,8 +201,7 @@ public class CouchBasePOJOInputOperator extends AbstractStoreInputOperator<Objec
       Object outputObj = null;
       try {
         outputObj = objectMapper.readValue(document.toString(), className);
-      }
-      catch (IOException ex) {
+      } catch (IOException ex) {
         throw new RuntimeException(ex);
       }
       outputPort.emit(outputObj);
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSerializer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSerializer.java
index f15758e..0769e82 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSerializer.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSerializer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
 
 /**
  *
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseStore.java
index 238047e..fb5ba1d 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseStore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
 
 import java.io.IOException;
 import java.net.URI;
@@ -28,6 +28,10 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import javax.validation.constraints.Min;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.apex.malhar.lib.db.Connectable;
+
 import com.couchbase.client.CouchbaseClient;
 import com.couchbase.client.CouchbaseConnectionFactoryBuilder;
 import com.couchbase.client.vbucket.ConfigurationProvider;
@@ -35,11 +39,6 @@ import com.couchbase.client.vbucket.ConfigurationProviderHTTP;
 import com.couchbase.client.vbucket.config.Bucket;
 import com.couchbase.client.vbucket.config.Config;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.datatorrent.lib.db.Connectable;
-
 import com.datatorrent.netlet.util.DTThrowable;
 
 /**
@@ -108,6 +107,7 @@ public class CouchBaseStore implements Connectable
   {
     this.queueSize = queueSize;
   }
+
   protected Integer maxTuples = 1000;
   protected int blockTime = 1000;
   protected long timeout = 10000;
@@ -192,8 +192,7 @@ public class CouchBaseStore implements Connectable
   {
     try {
       connect();
-    }
-    catch (IOException ex) {
+    } catch (IOException ex) {
       DTThrowable.rethrow(ex);
     }
     ConfigurationProvider configurationProvider = new ConfigurationProviderHTTP(baseURIs, userConfig, passwordConfig);
@@ -201,8 +200,7 @@ public class CouchBaseStore implements Connectable
     Config conf = configBucket.getConfig();
     try {
       disconnect();
-    }
-    catch (IOException ex) {
+    } catch (IOException ex) {
       DTThrowable.rethrow(ex);
     }
     return conf;
@@ -216,8 +214,7 @@ public class CouchBaseStore implements Connectable
     for (String url : tokens) {
       try {
         uri = new URI("http", url, "/pools", null, null);
-      }
-      catch (URISyntaxException ex) {
+      } catch (URISyntaxException ex) {
         DTThrowable.rethrow(ex);
       }
       baseURIs.add(uri);
@@ -228,9 +225,8 @@ public class CouchBaseStore implements Connectable
       cfb.setOpQueueMaxBlockTime(blockTime); // wait up to 10 second when trying to enqueue an operation
       client = new CouchbaseClient(cfb.buildCouchbaseConnection(baseURIs, bucket, password));
       //client = new CouchbaseClient(baseURIs, "default", "");
-    }
-    catch (IOException e) {
-      logger.error("Error connecting to Couchbase:" , e);
+    } catch (IOException e) {
+      logger.error("Error connecting to Couchbase:", e);
       DTThrowable.rethrow(e);
     }
   }
@@ -241,15 +237,13 @@ public class CouchBaseStore implements Connectable
     CouchbaseClient clientPartition = null;
     try {
       nodes.add(new URI("http",urlString,"/pools", null, null));
-    }
-    catch (URISyntaxException ex) {
+    } catch (URISyntaxException ex) {
       DTThrowable.rethrow(ex);
     }
     try {
       clientPartition = new CouchbaseClient(nodes, bucket, password);
-    }
-    catch (IOException e) {
-     logger.error("Error connecting to Couchbase:" , e);
+    } catch (IOException e) {
+      logger.error("Error connecting to Couchbase:", e);
       DTThrowable.rethrow(e);
     }
     return clientPartition;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseWindowStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseWindowStore.java
index 0c57ca6..2f0ce59 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseWindowStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseWindowStore.java
@@ -16,19 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import com.couchbase.client.CouchbaseClient;
-import com.couchbase.client.CouchbaseConnectionFactoryBuilder;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.datatorrent.lib.db.TransactionableStore;
+import org.apache.apex.malhar.lib.db.TransactionableStore;
+
+import com.couchbase.client.CouchbaseClient;
+import com.couchbase.client.CouchbaseConnectionFactoryBuilder;
 
 import com.datatorrent.netlet.util.DTThrowable;
 
@@ -92,9 +96,8 @@ public class CouchBaseWindowStore extends CouchBaseStore implements Transactiona
       cfb.setOpTimeout(timeout);  // wait up to 10 seconds for an operation to succeed
       cfb.setOpQueueMaxBlockTime(blockTime); // wait up to 10 second when trying to enqueue an operation
       clientMeta = new CouchbaseClient(cfb.buildCouchbaseConnection(baseURIs, bucketMeta, passwordMeta));
-    }
-    catch (IOException e) {
-      logger.error("Error connecting to Couchbase: " , e);
+    } catch (IOException e) {
+      logger.error("Error connecting to Couchbase: ", e);
       DTThrowable.rethrow(e);
     }
   }
@@ -119,11 +122,9 @@ public class CouchBaseWindowStore extends CouchBaseStore implements Transactiona
     String key = appId + "_" + operatorId + "_" + lastWindowValue;
     try {
       clientMeta.set(key, WindowIdBytes).get();
-    }
-    catch (InterruptedException ex) {
+    } catch (InterruptedException ex) {
       DTThrowable.rethrow(ex);
-    }
-    catch (ExecutionException ex) {
+    } catch (ExecutionException ex) {
       DTThrowable.rethrow(ex);
     }
 
@@ -163,8 +164,7 @@ public class CouchBaseWindowStore extends CouchBaseStore implements Transactiona
     try {
       result = dos.readLong();
       dos.close();
-    }
-    catch (IOException e) {
+    } catch (IOException e) {
       DTThrowable.rethrow(e);
     }
     return result;
@@ -179,8 +179,7 @@ public class CouchBaseWindowStore extends CouchBaseStore implements Transactiona
       dos.writeLong(l);
       result = baos.toByteArray();
       dos.close();
-    }
-    catch (IOException e) {
+    } catch (IOException e) {
       DTThrowable.rethrow(e);
     }
     return result;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchbasePOJOSetOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchbasePOJOSetOperator.java
index 5221b02..64ce9e2 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchbasePOJOSetOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchbasePOJOSetOperator.java
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
 
 import java.util.ArrayList;
 
 import javax.validation.constraints.NotNull;
 
-import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.Getter;
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Getter;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
 
 /**
  * An implementation of Couchbase Output Operator which takes a POJO,serializes it into key,value
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/package-info.java
index 1a6d05b..7b7dc59 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/package-info.java
@@ -17,4 +17,4 @@
  * under the License.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.couchbase;
+package org.apache.apex.malhar.contrib.couchbase;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBInputOperator.java
index 1935e5c..ad3e797 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBInputOperator.java
@@ -16,20 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchdb;
+package org.apache.apex.malhar.contrib.couchdb;
 
 import java.io.IOException;
 import java.util.List;
 
 import javax.validation.constraints.Min;
 
-import com.google.common.base.Throwables;
-
 import org.ektorp.ViewQuery;
 import org.ektorp.ViewResult;
 
-import com.datatorrent.lib.db.AbstractStoreInputOperator;
+import org.apache.apex.malhar.lib.db.AbstractStoreInputOperator;
 
+import com.google.common.base.Throwables;
 import com.datatorrent.api.Context;
 
 
@@ -92,8 +91,7 @@ public abstract class AbstractCouchDBInputOperator<T> extends AbstractStoreInput
         T tuple = getTuple(row);
         outputPort.emit(tuple);
       }
-    }
-    catch (Throwable cause) {
+    } catch (Throwable cause) {
       Throwables.propagate(cause);
     }
     if (rows.size() > 0) {
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBOutputOperator.java
index 5e6c24b..8080eda 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBOutputOperator.java
@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchdb;
+package org.apache.apex.malhar.contrib.couchdb;
 
-import com.datatorrent.lib.db.AbstractStoreOutputOperator;
-import java.util.Map;
+import org.apache.apex.malhar.lib.db.AbstractStoreOutputOperator;
 
 /**
  * Generic base output adaptor which saves tuples in the CouchDb.&nbsp; Subclasses should provide implementation for getting Document Id. <br/>
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractMapBasedInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractMapBasedInputOperator.java
index 94c814f..e39a91c 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractMapBasedInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractMapBasedInputOperator.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchdb;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.ektorp.ViewResult;
+package org.apache.apex.malhar.contrib.couchdb;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.codehaus.jackson.map.ObjectMapper;
+import org.ektorp.ViewResult;
+
 /**
  * A base CouchDb input adaptor that emits a map. <br/>
  * <p>
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperator.java
index 8111727..6d5defa 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchdb;
+package org.apache.apex.malhar.contrib.couchdb;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,14 +24,18 @@ import java.util.List;
 
 import javax.validation.constraints.NotNull;
 
-import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.ektorp.ViewQuery;
 import org.ektorp.ViewResult.Row;
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Setter;
+import org.apache.apex.malhar.lib.util.PojoUtils.SetterBoolean;
+import org.apache.apex.malhar.lib.util.PojoUtils.SetterDouble;
+import org.apache.apex.malhar.lib.util.PojoUtils.SetterInt;
+import org.apache.apex.malhar.lib.util.PojoUtils.SetterLong;
+import org.apache.hadoop.classification.InterfaceStability.Evolving;
 
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.*;
 import com.datatorrent.api.Context.OperatorContext;
 
 /**
@@ -184,8 +188,7 @@ public class CouchDBPOJOInputOperator extends AbstractCouchDBInputOperator<Objec
     try {
       // This code will be replaced after integration of creating POJOs on the fly utility.
       objectClass = Class.forName(outputClass);
-    }
-    catch (ClassNotFoundException ex) {
+    } catch (ClassNotFoundException ex) {
       throw new RuntimeException(ex);
     }
 
@@ -197,18 +200,15 @@ public class CouchDBPOJOInputOperator extends AbstractCouchDBInputOperator<Objec
       Class<?> type = null;
       try {
         type = objectClass.getDeclaredField(columns.get(i)).getType();
-      }
-      catch (NoSuchFieldException ex) {
+      } catch (NoSuchFieldException ex) {
         throw new RuntimeException(ex);
-      }
-      catch (SecurityException ex) {
+      } catch (SecurityException ex) {
         throw new RuntimeException(ex);
       }
       fieldType.add(type);
       if (type.isPrimitive()) {
         setterDoc.add(PojoUtils.constructSetter(objectClass, expressions.get(i), type));
-      }
-      else {
+      } else {
         setterDoc.add(PojoUtils.createSetter(objectClass, expressions.get(i), type));
       }
     }
@@ -222,11 +222,9 @@ public class CouchDBPOJOInputOperator extends AbstractCouchDBInputOperator<Objec
     Object obj;
     try {
       obj = objectClass.newInstance();
-    }
-    catch (InstantiationException ex) {
+    } catch (InstantiationException ex) {
       throw new RuntimeException(ex);
-    }
-    catch (IllegalAccessException ex) {
+    } catch (IllegalAccessException ex) {
       throw new RuntimeException(ex);
     }
 
@@ -240,21 +238,16 @@ public class CouchDBPOJOInputOperator extends AbstractCouchDBInputOperator<Objec
       if (type.isPrimitive()) {
         if (type == int.class) {
           ((SetterInt)setterDoc.get(i)).set(obj, val.get(columns.get(i)).getIntValue());
-        }
-        else if (type == boolean.class) {
+        } else if (type == boolean.class) {
           ((SetterBoolean)setterDoc.get(i)).set(obj, val.get(columns.get(i)).getBooleanValue());
-        }
-        else if (type == long.class) {
+        } else if (type == long.class) {
           ((SetterLong)setterDoc.get(i)).set(obj, val.get(columns.get(i)).getLongValue());
-        }
-        else if (type == double.class) {
+        } else if (type == double.class) {
           ((SetterDouble)setterDoc.get(i)).set(obj, val.get(columns.get(i)).getDoubleValue());
-        }
-        else {
+        } else {
           throw new RuntimeException("Type is not supported");
         }
-      }
-      else {
+      } else {
         ((Setter<Object, Object>)setterDoc.get(i)).set(obj, mapper.readValue(val.get(columns.get(i)), type));
       }
     }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOOutputOperator.java
index f75473c..9d75272 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOOutputOperator.java
@@ -16,15 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchdb;
+package org.apache.apex.malhar.contrib.couchdb;
 
 import javax.validation.constraints.NotNull;
 
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Getter;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.Getter;
-
 /**
  * Implementation of {@link AbstractCouchDBOutputOperator} that saves a POJO in the couch database. <br/>
  * <p>
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDbStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDbStore.java
index 88c2eab..31e5423 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDbStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDbStore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchdb;
+package org.apache.apex.malhar.contrib.couchdb;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -32,7 +32,7 @@ import org.ektorp.http.HttpClient;
 import org.ektorp.http.StdHttpClient;
 import org.ektorp.impl.StdCouchDbInstance;
 
-import com.datatorrent.lib.db.Connectable;
+import org.apache.apex.malhar.lib.db.Connectable;
 
 /**
  * Implements a CouchDb store. <br/>
@@ -141,8 +141,7 @@ public class CouchDbStore implements Connectable
   {
     if (docId != null && dbConnector.contains(docId)) {
       dbConnector.update(document);
-    }
-    else {
+    } else {
       //create a document & if docId is null then couch db will generate a random id.
       dbConnector.create(document);
     }
@@ -166,8 +165,7 @@ public class CouchDbStore implements Connectable
     if (dbUrl != null) {
       try {
         builder.url(dbUrl);
-      }
-      catch (MalformedURLException e) {
+      } catch (MalformedURLException e) {
         throw new IllegalArgumentException(e.getMessage());
       }
     }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/MapBasedCouchDbOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/MapBasedCouchDbOutputOperator.java
index f83f93c..6c8b813 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/MapBasedCouchDbOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/MapBasedCouchDbOutputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.couchdb;
+package org.apache.apex.malhar.contrib.couchdb;
 
 import java.util.Map;
 
@@ -34,7 +34,7 @@ public class MapBasedCouchDbOutputOperator extends AbstractCouchDBOutputOperator
   @Override
   public String getDocumentId(Map<Object, Object> tuple)
   {
-    return (String) tuple.get("_id");
+    return (String)tuple.get("_id");
   }
 
 }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/package-info.java
index be6ec34..13b7e17 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/package-info.java
@@ -17,4 +17,4 @@
  * under the License.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.couchdb;
+package org.apache.apex.malhar.contrib.couchdb;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
index 022530b..5d9e915 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.elasticsearch;
+package org.apache.apex.malhar.contrib.elasticsearch;
 
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.search.SearchHit;
 
+import org.apache.apex.malhar.lib.db.AbstractStoreInputOperator;
+
 import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.lib.db.AbstractStoreInputOperator;
 
 /**
  * This is the base implementation for a non transactional input operator for ElasticSearch
@@ -53,7 +54,7 @@ public abstract class AbstractElasticSearchInputOperator<T, S extends ElasticSea
   /**
    * Initializing transient fields such as ElasticSearchConnectable, SearchRequestBuilder
    *
-   * @see com.datatorrent.lib.db.AbstractStoreInputOperator#setup(com.datatorrent.api.Context.OperatorContext)
+   * @see org.apache.apex.malhar.lib.db.AbstractStoreInputOperator#setup(com.datatorrent.api.Context.OperatorContext)
    */
   @Override
   public void setup(OperatorContext t1)
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
index 0282ae8..34b4440 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.elasticsearch;
+package org.apache.apex.malhar.contrib.elasticsearch;
 
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -27,9 +27,10 @@ import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 
+import org.apache.apex.malhar.lib.db.AbstractStoreOutputOperator;
+
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.db.AbstractStoreOutputOperator;
 
 /**
  * This is the base implementation for a non-transactional batch output operator for ElasticSearch.
@@ -70,7 +71,7 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
   /**
    * Initialize transient fields such as {@code tupleBatch}
    *
-   * @see com.datatorrent.lib.db.AbstractStoreOutputOperator#setup(com.datatorrent.api.Context.OperatorContext)
+   * @see org.apache.apex.malhar.lib.db.AbstractStoreOutputOperator#setup(com.datatorrent.api.Context.OperatorContext)
    */
   @Override
   public void setup(OperatorContext context)
@@ -83,7 +84,7 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
    * Adds tuple to the queue.
    * Calls {@link #processBatch()} if queue is full
    *
-   * @see com.datatorrent.lib.db.AbstractStoreOutputOperator#processTuple(java.lang.Object)
+   * @see org.apache.apex.malhar.lib.db.AbstractStoreOutputOperator#processTuple(java.lang.Object)
    */
   public void processTuple(T tuple)
   {
@@ -128,7 +129,8 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
    * @param tuple
    * @return
    */
-  protected IndexRequestBuilder getIndexRequestBuilder(T tuple){
+  protected IndexRequestBuilder getIndexRequestBuilder(T tuple)
+  {
     IndexRequestBuilder indexRequestBuilder = new IndexRequestBuilder(store.client, getIndexName(tuple));
     String id = getId(tuple);
     if (id != null) {
@@ -176,22 +178,22 @@ public abstract class AbstractElasticSearchOutputOperator<T, S extends ElasticSe
    * @param tuple
    * @return
    */
-    protected abstract String getType(T tuple);
+  protected abstract String getType(T tuple);
 
     /**
      * @return the batchSize
      */
-    public int getBatchSize()
-    {
-      return batchSize;
-    }
+  public int getBatchSize()
+  {
+    return batchSize;
+  }
 
     /**
      * @param batchSize the batchSize to set
      */
-    public void setBatchSize(int batchSize)
-    {
-      this.batchSize = batchSize;
-    }
+  public void setBatchSize(int batchSize)
+  {
+    this.batchSize = batchSize;
+  }
 
 }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchConnectable.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchConnectable.java
index 34eca95..c607393 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchConnectable.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchConnectable.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.elasticsearch;
+package org.apache.apex.malhar.contrib.elasticsearch;
 
 import java.io.IOException;
 
@@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 
-import com.datatorrent.lib.db.Connectable;
+import org.apache.apex.malhar.lib.db.Connectable;
 
 /**
  * Elastic search base connector which has basic information for an operator <br>
@@ -91,7 +91,7 @@ public class ElasticSearchConnectable implements Connectable
   /*
    * (non-Javadoc)
    *
-   * @see com.datatorrent.lib.db.Connectable#connect()
+   * @see org.apache.apex.malhar.lib.db.Connectable#connect()
    */
   @Override
   public void connect() throws IOException
@@ -103,7 +103,7 @@ public class ElasticSearchConnectable implements Connectable
   /*
    * (non-Javadoc)
    *
-   * @see com.datatorrent.lib.db.Connectable#disconnect()
+   * @see org.apache.apex.malhar.lib.db.Connectable#disconnect()
    */
   @Override
   public void disconnect() throws IOException
@@ -116,7 +116,7 @@ public class ElasticSearchConnectable implements Connectable
   /*
    * (non-Javadoc)
    *
-   * @see com.datatorrent.lib.db.Connectable#isConnected()
+   * @see org.apache.apex.malhar.lib.db.Connectable#isConnected()
    */
   @Override
   public boolean isConnected()
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapInputOperator.java
index dcbee9d..6774f10 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapInputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.elasticsearch;
+package org.apache.apex.malhar.contrib.elasticsearch;
 
 import java.util.Map;
 
@@ -50,7 +50,7 @@ public abstract class ElasticSearchMapInputOperator<T extends Map<String, Object
   /**
    * {@link SearchRequestBuilder} properties which do not change for each window are set during operator initialization.
    *
-   * @see com.datatorrent.contrib.elasticsearch.AbstractElasticSearchInputOperator#setup(com.datatorrent.api.Context.OperatorContext)
+   * @see org.apache.apex.malhar.contrib.elasticsearch.AbstractElasticSearchInputOperator#setup(com.datatorrent.api.Context.OperatorContext)
    */
   @Override
   public void setup(OperatorContext t1)
@@ -63,14 +63,14 @@ public abstract class ElasticSearchMapInputOperator<T extends Map<String, Object
    * (non-Javadoc)
    *
    * @see
-   * com.datatorrent.contrib.elasticsearch.AbstractElasticSearchInputOperator#convertToTuple(org.elasticsearch.search
+   * org.apache.apex.malhar.contrib.elasticsearch.AbstractElasticSearchInputOperator#convertToTuple(org.elasticsearch.search
    * .SearchHit)
    */
   @Override
   protected T convertToTuple(SearchHit hit)
   {
     Map<String, Object> tuple = hit.getSource();
-    return (T) tuple;
+    return (T)tuple;
   }
 
   /**
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapOutputOperator.java
index 8616938..d85f0a3 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapOutputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.elasticsearch;
+package org.apache.apex.malhar.contrib.elasticsearch;
 
 import java.util.Map;
 
@@ -50,7 +50,7 @@ public class ElasticSearchMapOutputOperator<T extends Map<String, Object>> exten
    * (non-Javadoc)
    *
    * @see
-   * com.datatorrent.contrib.elasticsearch.AbstractElasticSearchOutputOperator#setSource(org.elasticsearch.action.index
+   * org.apache.apex.malhar.contrib.elasticsearch.AbstractElasticSearchOutputOperator#setSource(org.elasticsearch.action.index
    * .IndexRequestBuilder, java.lang.Object)
    */
   @Override
@@ -62,7 +62,7 @@ public class ElasticSearchMapOutputOperator<T extends Map<String, Object>> exten
   /*
    * (non-Javadoc)
    *
-   * @see com.datatorrent.contrib.elasticsearch.AbstractElasticSearchOutputOperator#getId(java.lang.Object)
+   * @see org.apache.apex.malhar.contrib.elasticsearch.AbstractElasticSearchOutputOperator#getId(java.lang.Object)
    */
   @Override
   protected String getId(T tuple)
@@ -104,7 +104,7 @@ public class ElasticSearchMapOutputOperator<T extends Map<String, Object>> exten
   /*
    * (non-Javadoc)
    *
-   * @see com.datatorrent.contrib.elasticsearch.AbstractElasticSearchOutputOperator#getIndexName(java.lang.Object)
+   * @see org.apache.apex.malhar.contrib.elasticsearch.AbstractElasticSearchOutputOperator#getIndexName(java.lang.Object)
    */
   @Override
   protected String getIndexName(T tuple)
@@ -122,7 +122,7 @@ public class ElasticSearchMapOutputOperator<T extends Map<String, Object>> exten
   }
 
   /* (non-Javadoc)
-   * @see com.datatorrent.contrib.elasticsearch.AbstractElasticSearchOutputOperator#getType(java.lang.Object)
+   * @see org.apache.apex.malhar.contrib.elasticsearch.AbstractElasticSearchOutputOperator#getType(java.lang.Object)
    */
   @Override
   protected String getType(T tuple)
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
index 9f7b66c..614fd59 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.elasticsearch;
+package org.apache.apex.malhar.contrib.elasticsearch;
 
 import java.io.IOException;
 
@@ -24,9 +24,9 @@ import javax.validation.constraints.NotNull;
 
 import org.elasticsearch.action.percolate.PercolateResponse;
 
-import com.datatorrent.common.util.BaseOperator;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
+import com.datatorrent.common.util.BaseOperator;
 import com.datatorrent.netlet.util.DTThrowable;
 
 /**
@@ -50,8 +50,8 @@ public class ElasticSearchPercolatorOperator extends BaseOperator
   protected transient ElasticSearchPercolatorStore store;
   public final transient DefaultOutputPort<PercolateResponse> outputPort = new DefaultOutputPort<PercolateResponse>();
 
-  public final transient DefaultInputPort<Object> inputPort = new DefaultInputPort<Object>() {
-
+  public final transient DefaultInputPort<Object> inputPort = new DefaultInputPort<Object>()
+  {
     /*
      * (non-Javadoc)
      *
@@ -61,7 +61,7 @@ public class ElasticSearchPercolatorOperator extends BaseOperator
     public void process(Object tuple)
     {
 
-      PercolateResponse response = store.percolate(new String[] { indexName }, documentType, tuple);
+      PercolateResponse response = store.percolate(new String[] {indexName}, documentType, tuple);
       outputPort.emit(response);
     }
   };
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorStore.java
index c13c025..19639c7 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorStore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.elasticsearch;
+package org.apache.apex.malhar.contrib.elasticsearch;
 
 import java.io.IOException;
 
@@ -58,7 +58,8 @@ public class ElasticSearchPercolatorStore extends ElasticSearchConnectable
     }
   }
 
-  public PercolateResponse percolate(String[] indexNames, String documentType, Object tuple){
+  public PercolateResponse percolate(String[] indexNames, String documentType, Object tuple)
+  {
     XContentBuilder docBuilder;
     try {
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/package-info.java
index d89d53f..1c74c32 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/package-info.java
@@ -17,4 +17,4 @@
  * under the License.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.elasticsearch;
+package org.apache.apex.malhar.contrib.elasticsearch;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/AbstractEnricher.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/AbstractEnricher.java
index c377b96..b7e8820 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/AbstractEnricher.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/AbstractEnricher.java
@@ -16,12 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.apex.malhar.lib.db.cache.CacheManager;
+import org.apache.apex.malhar.lib.db.cache.CacheStore;
+import org.apache.apex.malhar.lib.db.cache.CacheStore.ExpiryType;
+import org.apache.apex.malhar.lib.util.FieldInfo;
+import org.apache.apex.malhar.lib.util.FieldInfo.SupportType;
 import org.apache.hadoop.classification.InterfaceStability;
 
 import com.esotericsoftware.kryo.NotNull;
@@ -29,11 +34,6 @@ import com.esotericsoftware.kryo.NotNull;
 import com.datatorrent.api.Context;
 import com.datatorrent.api.Operator;
 import com.datatorrent.common.util.BaseOperator;
-import com.datatorrent.lib.db.cache.CacheManager;
-import com.datatorrent.lib.db.cache.CacheStore;
-import com.datatorrent.lib.db.cache.CacheStore.ExpiryType;
-import com.datatorrent.lib.util.FieldInfo;
-import com.datatorrent.lib.util.FieldInfo.SupportType;
 
 /**
  * Base class for Enrichment Operator.&nbsp; Subclasses should provide implementation to getKey and convert.
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/BackendLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/BackendLoader.java
index 845a756..62d11a0 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/BackendLoader.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/BackendLoader.java
@@ -16,15 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.util.List;
 
+import org.apache.apex.malhar.lib.db.cache.CacheManager;
+import org.apache.apex.malhar.lib.util.FieldInfo;
 import org.apache.hadoop.classification.InterfaceStability;
 
-import com.datatorrent.lib.db.cache.CacheManager;
-import com.datatorrent.lib.util.FieldInfo;
-
 /**
  * Interface for store to be used in enrichment
  *
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/DelimitedFSLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/DelimitedFSLoader.java
index 3121cf1..aa4a8bd 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/DelimitedFSLoader.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/DelimitedFSLoader.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.io.IOException;
 import java.util.List;
@@ -30,14 +30,13 @@ import org.supercsv.cellprocessor.ift.CellProcessor;
 import org.supercsv.io.CsvMapReader;
 import org.supercsv.prefs.CsvPreference;
 
+import org.apache.apex.malhar.contrib.parser.CellProcessorBuilder;
+import org.apache.apex.malhar.contrib.parser.DelimitedSchema;
+import org.apache.apex.malhar.contrib.parser.DelimitedSchema.Field;
+import org.apache.apex.malhar.lib.util.ReusableStringReader;
 import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.classification.InterfaceStability;
 
-import com.datatorrent.contrib.parser.CellProcessorBuilder;
-import com.datatorrent.contrib.parser.DelimitedSchema;
-import com.datatorrent.contrib.parser.DelimitedSchema.Field;
-import com.datatorrent.lib.util.ReusableStringReader;
-
 /**
  * This implementation of {@link FSLoader} is used to load data from delimited
  * file.User needs to provide a schema as a string specified in a json format as
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FSLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FSLoader.java
index e04d6c4..cc23cb2 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FSLoader.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FSLoader.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -28,6 +28,8 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.db.cache.CacheManager;
+import org.apache.apex.malhar.lib.util.FieldInfo;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
@@ -38,8 +40,6 @@ import com.esotericsoftware.kryo.NotNull;
 import com.google.common.collect.Maps;
 
 import com.datatorrent.api.Component;
-import com.datatorrent.lib.db.cache.CacheManager;
-import com.datatorrent.lib.util.FieldInfo;
 
 /**
  * This implementation of {@link BackendLoader} loads the data from a given file
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FixedWidthFSLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FixedWidthFSLoader.java
index 2f54f66..e855c07 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FixedWidthFSLoader.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FixedWidthFSLoader.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -30,6 +30,8 @@ import javax.validation.constraints.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.contrib.parser.AbstractCsvParser.FIELD_TYPE;
+import org.apache.apex.malhar.contrib.parser.AbstractCsvParser.Field;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.classification.InterfaceStability;
 
@@ -39,9 +41,6 @@ import com.univocity.parsers.fixed.FixedWidthFields;
 import com.univocity.parsers.fixed.FixedWidthParser;
 import com.univocity.parsers.fixed.FixedWidthParserSettings;
 
-import com.datatorrent.contrib.parser.AbstractCsvParser.FIELD_TYPE;
-import com.datatorrent.contrib.parser.AbstractCsvParser.Field;
-
 /**
  * This implementation of {@link FSLoader} is used to load data from fixed width
  * file.User needs to set {@link FixedWidthFSLoader#fieldDescription} to specify
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JDBCLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JDBCLoader.java
index ce02c08..0ed9e22 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JDBCLoader.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JDBCLoader.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -26,12 +26,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.apex.malhar.lib.db.jdbc.JdbcStore;
+import org.apache.apex.malhar.lib.util.FieldInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.hadoop.classification.InterfaceStability;
 
 import com.google.common.collect.Lists;
-import com.datatorrent.lib.db.jdbc.JdbcStore;
-import com.datatorrent.lib.util.FieldInfo;
 
 /**
  * <p>HBaseLoader extends from {@link JdbcStore} uses JDBC to connect and implements BackendLoaders interface.</p> <br/>
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JsonFSLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JsonFSLoader.java
index 183d07a..1347100 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JsonFSLoader.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JsonFSLoader.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/MapEnricher.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/MapEnricher.java
index 6e7b5f7..d3d8df4 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/MapEnricher.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/MapEnricher.java
@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.apex.malhar.lib.util.FieldInfo;
 import org.apache.hadoop.classification.InterfaceStability;
 
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.lib.util.FieldInfo;
 
 /**
  * This class takes a HashMap tuple as input and extracts value of the lookupKey configured
- * for this operator. It perform a lookup using {@link com.datatorrent.lib.db.cache.CacheManager} to
+ * for this operator. It perform a lookup using {@link org.apache.apex.malhar.lib.db.cache.CacheManager} to
  * find a matching entry and adds the result to the original tuple.
  *
  * <p>
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/NullValuesCacheManager.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/NullValuesCacheManager.java
index 6d42fec..74f3f97 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/NullValuesCacheManager.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/NullValuesCacheManager.java
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
+import org.apache.apex.malhar.lib.db.cache.CacheManager;
 import org.apache.hadoop.classification.InterfaceStability;
 
-import com.datatorrent.lib.db.cache.CacheManager;
-
 /**
  * Null Values Cache Manager. Using this NULL entries can be specified explicitly.
  *
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/POJOEnricher.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/POJOEnricher.java
index f22acdb..1f979ee 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/POJOEnricher.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/POJOEnricher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -26,6 +26,9 @@ import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import org.apache.apex.malhar.lib.util.FieldInfo;
+import org.apache.apex.malhar.lib.util.PojoUtils;
 import org.apache.commons.lang3.ClassUtils;
 import org.apache.hadoop.classification.InterfaceStability;
 
@@ -35,13 +38,11 @@ import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.annotation.InputPortFieldAnnotation;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
-import com.datatorrent.lib.util.FieldInfo;
-import com.datatorrent.lib.util.PojoUtils;
 
 
 /**
  * This class takes a POJO as input and extracts the value of the lookupKey configured
- * for this operator. It perform a lookup using {@link com.datatorrent.lib.db.cache.CacheManager} to
+ * for this operator. It perform a lookup using {@link org.apache.apex.malhar.lib.db.cache.CacheManager} to
  * find a matching entry and adds the result to the original tuple.
  *
  * <p>
@@ -212,7 +213,7 @@ public class POJOEnricher extends AbstractEnricher<Object, Object>
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   private PojoUtils.Setter generateSettersForField(Class<?> klass, String outputFieldName)
-      throws NoSuchFieldException, SecurityException
+    throws NoSuchFieldException, SecurityException
   {
     Field f = klass.getDeclaredField(outputFieldName);
     Class c = ClassUtils.primitiveToWrapper(f.getType());
@@ -221,7 +222,7 @@ public class POJOEnricher extends AbstractEnricher<Object, Object>
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   private PojoUtils.Getter generateGettersForField(Class<?> klass, String inputFieldName)
-      throws NoSuchFieldException, SecurityException
+    throws NoSuchFieldException, SecurityException
   {
     Field f = klass.getDeclaredField(inputFieldName);
     Class c = ClassUtils.primitiveToWrapper(f.getType());
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/ReadOnlyBackup.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/ReadOnlyBackup.java
index c6afbe1..0ae3ee7 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/ReadOnlyBackup.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/ReadOnlyBackup.java
@@ -16,15 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.enrich;
+package org.apache.apex.malhar.contrib.enrich;
 
 import java.util.List;
 import java.util.Map;
 
+import org.apache.apex.malhar.lib.util.FieldInfo;
 import org.apache.hadoop.classification.InterfaceStability;
 
-import com.datatorrent.lib.util.FieldInfo;
-
 /**
  * ReadOnly abstract implementation of BackendLoader.
  *
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/formatter/CsvFormatter.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/formatter/CsvFormatter.java
index 2bd0e67..3469039 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/formatter/CsvFormatter.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/formatter/CsvFormatter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.formatter;
+package org.apache.apex.malhar.contrib.formatter;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -34,14 +34,15 @@ import org.supercsv.io.CsvBeanWriter;
 import org.supercsv.io.ICsvBeanWriter;
 import org.supercsv.prefs.CsvPreference;
 
+import org.apache.apex.malhar.contrib.parser.DelimitedSchema;
+import org.apache.apex.malhar.contrib.parser.DelimitedSchema.Field;
+import org.apache.apex.malhar.contrib.parser.Schema.FieldType;
+import org.apache.apex.malhar.lib.formatter.Formatter;
+
 import com.google.common.annotations.VisibleForTesting;
 
 import com.datatorrent.api.AutoMetric;
 import com.datatorrent.api.Context;
-import com.datatorrent.contrib.parser.DelimitedSchema;
-import com.datatorrent.contrib.parser.DelimitedSchema.Field;
-import com.datatorrent.contrib.parser.Schema.FieldType;
-import com.datatorrent.lib.formatter.Formatter;
 import com.datatorrent.netlet.util.DTThrowable;
 
 /**
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeInputOperator.java
index 497e6e4..d56d471 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeInputOperator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.geode;
+package org.apache.apex.malhar.contrib.geode;
 
-import com.datatorrent.lib.db.AbstractKeyValueStoreInputOperator;
+import org.apache.apex.malhar.lib.db.AbstractKeyValueStoreInputOperator;
 
 /**
  * This is the base implementation used for geode input adapters.&nbsp; A
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeOutputOperator.java
index dd0bad2..d3951fc 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeOutputOperator.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.geode;
+package org.apache.apex.malhar.contrib.geode;
 
-import com.datatorrent.lib.db.AbstractStoreOutputOperator;
+import org.apache.apex.malhar.lib.db.AbstractStoreOutputOperator;
 
 /**
  * This is the base implementation of geode output operators.&nbsp; A concrete
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStore.java
index 2152b97..0c01373 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStore.java
@@ -16,9 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.geode;
+package org.apache.apex.malhar.contrib.geode;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.apex.malhar.lib.util.StorageAgentKeyValueStore;
 
-import com.datatorrent.lib.util.StorageAgentKeyValueStore;
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
@@ -32,17 +44,6 @@ import com.gemstone.gemfire.cache.query.Query;
 import com.gemstone.gemfire.cache.query.QueryService;
 import com.gemstone.gemfire.cache.query.SelectResults;
 import com.google.common.collect.Maps;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 
 /**
  * Geode Store implementation of {@link StorageAgentKeyValueStore} Uses {@link Kryo}
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgent.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgent.java
index 691c2c1..819d531 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgent.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgent.java
@@ -16,14 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.geode;
+package org.apache.apex.malhar.contrib.geode;
 
 import java.io.Serializable;
 
+import org.apache.apex.malhar.lib.util.AbstractKeyValueStorageAgent;
 import org.apache.hadoop.conf.Configuration;
 
-import com.datatorrent.lib.util.AbstractKeyValueStorageAgent;
-
 /**
  * Storage Agent implementation which uses {@link GeodeCheckpointStore} for operator
  * checkpointing
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOutputOperator.java
index c7d22c7..d2001e5 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOutputOperator.java
@@ -16,15 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.geode;
+package org.apache.apex.malhar.contrib.geode;
 
+import org.apache.apex.malhar.lib.util.FieldInfo;
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Getter;
+import org.apache.apex.malhar.lib.util.TableInfo;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 
-import com.datatorrent.lib.util.FieldInfo;
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.Getter;
-import com.datatorrent.lib.util.TableInfo;
-
 /**
  *
  * @displayName Geode Output Operator
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeStore.java
index d345661..803a83e 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeStore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.geode;
+package org.apache.apex.malhar.contrib.geode;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -27,7 +27,7 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.accumulo.core.client.impl.thrift.ThriftTest.Processor.throwsError;
+import org.apache.apex.malhar.lib.db.KeyValueStore;
 
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.CacheWriterException;
@@ -43,8 +43,6 @@ import com.gemstone.gemfire.cache.query.QueryInvocationTargetException;
 import com.gemstone.gemfire.cache.query.SelectResults;
 import com.gemstone.gemfire.cache.query.TypeMismatchException;
 
-import com.datatorrent.lib.db.KeyValueStore;
-
 /**
  * Provides the implementation of a Geode store.
  * Geode is a distributed in-memory database
@@ -145,7 +143,7 @@ public class GeodeStore implements KeyValueStore, Serializable
     if (region == null) {
       region = clientCache.getRegion(regionName);
       if (region == null) {
-        region = clientCache.<Object, Object> createClientRegionFactory(ClientRegionShortcut.PROXY).create(regionName);
+        region = clientCache.<Object, Object>createClientRegionFactory(ClientRegionShortcut.PROXY).create(regionName);
       }
     }
 
@@ -164,7 +162,7 @@ public class GeodeStore implements KeyValueStore, Serializable
     region = clientCache.getRegion(getRegionName());
 
     if (region == null) {
-      region = clientCache.<Object, Object> createClientRegionFactory(ClientRegionShortcut.PROXY).create(
+      region = clientCache.<Object, Object>createClientRegionFactory(ClientRegionShortcut.PROXY).create(
           getRegionName());
     }
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/RegionCreateFunction.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/RegionCreateFunction.java
index 9e948c4..d7aa9d5 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/RegionCreateFunction.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/RegionCreateFunction.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.geode;
+package org.apache.apex.malhar.contrib.geode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseAppendOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseAppendOutputOperator.java
index a2c1297..d83768d 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseAppendOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseAppendOutputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.IOException;
 
@@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.client.HTable;
 import com.datatorrent.netlet.util.DTThrowable;
 
 /**
- * A base implementation of a StoreOutputOperator operator that stores tuples in HBase columns and offers 
+ * A base implementation of a StoreOutputOperator operator that stores tuples in HBase columns and offers
  * non-transactional append.&nbsp; Subclasses should provide implementation for appending operations. <br>
  * <p>
  * <br>
@@ -49,16 +49,19 @@ import com.datatorrent.netlet.util.DTThrowable;
  *            The tuple type
  * @since 1.0.2
  */
-public abstract class AbstractHBaseAppendOutputOperator<T> extends AbstractHBaseOutputOperator<T> {
+public abstract class AbstractHBaseAppendOutputOperator<T> extends AbstractHBaseOutputOperator<T>
+{
   private static final transient Logger logger = LoggerFactory
       .getLogger(AbstractHBaseAppendOutputOperator.class);
 
-  public AbstractHBaseAppendOutputOperator() {
+  public AbstractHBaseAppendOutputOperator()
+  {
     store = new HBaseStore();
   }
 
   @Override
-  public void processTuple(T tuple, HTable table) {
+  public void processTuple(T tuple, HTable table)
+  {
     Append append = operationAppend(tuple);
     try {
       table.append(append);
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseOutputOperator.java
similarity index 93%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseOutputOperator.java
index b9d3c49..f07f123 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseOutputOperator.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
+import org.apache.apex.malhar.lib.db.AbstractStoreOutputOperator;
 import org.apache.hadoop.hbase.client.HTable;
 
 import com.datatorrent.api.Operator;
-import com.datatorrent.lib.db.AbstractStoreOutputOperator;
 
 /**
- * A base implementation of a HBase output operator that stores tuples in HBase and offers 
+ * A base implementation of a HBase output operator that stores tuples in HBase and offers
  * non-transactional Insert.&nbsp; Subclasses should provide implementation for specific Hbase operations.
  *
  * @since 3.8.0
@@ -32,7 +32,7 @@ import com.datatorrent.lib.db.AbstractStoreOutputOperator;
 public abstract class AbstractHBaseOutputOperator<T> extends AbstractStoreOutputOperator<T, HBaseStore> implements OutputAdapter.Driver<T>, Operator.CheckpointNotificationListener
 {
   private transient OutputAdapter<T> outputAdapter;
-  
+
   public AbstractHBaseOutputOperator()
   {
     outputAdapter = new OutputAdapter<T>(store, this);
@@ -43,13 +43,13 @@ public abstract class AbstractHBaseOutputOperator<T> extends AbstractStoreOutput
   {
     outputAdapter.processTuple(tuple);
   }
-  
+
   @Override
   public abstract void processTuple(T tuple, HTable table);
 
   /**
    * Get the table name for tuple.
-   * 
+   *
    * Implementations can override this method to return the table name where the tuple should be written to.
    * Return null to write to default table
    * @param tuple The tuple
@@ -84,5 +84,5 @@ public abstract class AbstractHBaseOutputOperator<T> extends AbstractStoreOutput
   {
 
   }
-  
+
 }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBasePutOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBasePutOutputOperator.java
index 2421936..cc5f8e4 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBasePutOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBasePutOutputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.InterruptedIOException;
 
@@ -48,7 +48,8 @@ import com.datatorrent.netlet.util.DTThrowable;
  *            The tuple type
  * @since 1.0.2
  */
-public abstract class AbstractHBasePutOutputOperator<T> extends AbstractHBaseOutputOperator<T> {
+public abstract class AbstractHBasePutOutputOperator<T> extends AbstractHBaseOutputOperator<T>
+{
   private static final transient Logger logger = LoggerFactory.getLogger(AbstractHBasePutOutputOperator.class);
 
   public AbstractHBasePutOutputOperator()
@@ -56,7 +57,6 @@ public abstract class AbstractHBasePutOutputOperator<T> extends AbstractHBaseOut
     store = new HBaseStore();
   }
 
-  @Override
   public void processTuple(T tuple, HTable table)
   {
     Put put = operationPut(tuple);
@@ -72,5 +72,5 @@ public abstract class AbstractHBasePutOutputOperator<T> extends AbstractHBaseOut
   }
 
   public abstract Put operationPut(T t);
-  
+
 }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
index 2fa2146..1747cde 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.IOException;
 
@@ -30,7 +30,9 @@ import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.netlet.util.DTThrowable;
 
 /**
- * A base implementation of an AggregateTransactionableStoreOutputOperator operator that stores tuples in HBase columns and provides batch append.&nbsp; Subclasses should provide implementation for appending operations. <br>
+ * A base implementation of an AggregateTransactionableStoreOutputOperator
+ * operator that stores tuples in HBase columns and provides batch append.&nbsp;
+ * Subclasses should provide implementation for appending operations. <br>
  * <p>
  * <br>
  * This class provides a HBase output operator that can be used to store tuples
@@ -45,17 +47,17 @@ import com.datatorrent.netlet.util.DTThrowable;
  * guarantee each tuple is written only once to HBase in case the operator is
  * restarted from an earlier checkpoint. It only tries to minimize the number of
  * duplicates limiting it to the tuples that were processed in the window when
- * the operator shutdown.
- * It supports atleast once and atmost once processing modes.
- * Exactly once is not supported
+ * the operator shutdown. It supports atleast once and atmost once processing
+ * modes. Exactly once is not supported
+ *
  * @displayName Abstract HBase Window Append Output
  * @category Output
  * @tags hbase, append, transactionable, batch
- * @param <T>
- *            The tuple type
+ * @param <T> The tuple type
  * @since 1.0.2
  */
-public abstract class AbstractHBaseWindowAppendOutputOperator<T> extends AbstractHBaseWindowOutputOperator<T> {
+public abstract class AbstractHBaseWindowAppendOutputOperator<T> extends AbstractHBaseWindowOutputOperator<T>
+{
   private static final transient Logger logger = LoggerFactory.getLogger(AbstractHBaseWindowAppendOutputOperator.class);
   private transient ProcessingMode mode;
 
@@ -74,12 +76,14 @@ public abstract class AbstractHBaseWindowAppendOutputOperator<T> extends Abstrac
     this.mode = mode;
   }
 
-  public AbstractHBaseWindowAppendOutputOperator() {
+  public AbstractHBaseWindowAppendOutputOperator()
+  {
     store = new HBaseWindowStore();
   }
 
   @Override
-  public void processTuple(T tuple, HTable table) {
+  public void processTuple(T tuple, HTable table)
+  {
     try {
       Append append = operationAppend(tuple);
       table.append(append);
@@ -103,8 +107,8 @@ public abstract class AbstractHBaseWindowAppendOutputOperator<T> extends Abstrac
   @Override
   public void setup(OperatorContext context)
   {
-    mode=context.getValue(OperatorContext.PROCESSING_MODE);
-    if(mode==ProcessingMode.EXACTLY_ONCE){
+    mode = context.getValue(OperatorContext.PROCESSING_MODE);
+    if (mode == ProcessingMode.EXACTLY_ONCE) {
       throw new RuntimeException("This operator only supports atmost once and atleast once processing modes");
     }
     super.setup(context);
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowOutputOperator.java
similarity index 95%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowOutputOperator.java
index 665b463..fb21bf9 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowOutputOperator.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.db.AbstractPassThruTransactionableStoreOutputOperator;
 import org.apache.hadoop.hbase.client.HTable;
 
 import com.datatorrent.api.Operator;
-import com.datatorrent.lib.db.AbstractPassThruTransactionableStoreOutputOperator;
 
 /**
  * A base implementation of an AggregateTransactionableStoreOutputOperator that stores tuples in HBase
@@ -38,7 +38,7 @@ public abstract class AbstractHBaseWindowOutputOperator<T> extends AbstractPassT
    * Both at checkpoint window and end window, flush the tuples as application window may not align with
    * end window especially when it is more than one streaming window
    */
-  
+
   private static final Logger logger = LoggerFactory.getLogger(AbstractHBaseWindowOutputOperator.class);
 
   private transient OutputAdapter<T> outputAdapter;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
index 70fbeeb..e6c65fc 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.IOException;
 
@@ -30,7 +30,9 @@ import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.netlet.util.DTThrowable;
 
 /**
- * A base implementation of an AggregateTransactionableStoreOutputOperator operator for storing tuples in HBase rows and provides a batch put.Subclasses should provide implementation for put operation. <br>
+ * A base implementation of an AggregateTransactionableStoreOutputOperator
+ * operator for storing tuples in HBase rows and provides a batch put.Subclasses
+ * should provide implementation for put operation. <br>
  * <p>
  * <br>
  * This class provides a HBase output operator that can be used to store tuples
@@ -45,20 +47,20 @@ import com.datatorrent.netlet.util.DTThrowable;
  * guarantee each tuple is written only once to HBase in case the operator is
  * restarted from an earlier checkpoint. It only tries to minimize the number of
  * duplicates limiting it to the tuples that were processed in the window when
- * the operator shutdown.
- * It supports atleast once and atmost once processing modes.
- * Exactly once is not supported
+ * the operator shutdown. It supports atleast once and atmost once processing
+ * modes. Exactly once is not supported
+ *
  * @displayName Abstract HBase Window Put Output
  * @category Output
  * @tags hbase, put, transactionable, batch
- * @param <T>
- *            The tuple type
+ * @param <T> The tuple type
  * @since 1.0.2
  */
-public abstract class AbstractHBaseWindowPutOutputOperator<T> extends AbstractHBaseWindowOutputOperator<T> {
+public abstract class AbstractHBaseWindowPutOutputOperator<T> extends AbstractHBaseWindowOutputOperator<T>
+{
   private static final transient Logger logger = LoggerFactory.getLogger(AbstractHBaseWindowPutOutputOperator.class);
   private transient ProcessingMode mode;
-  
+
   @Deprecated
   public ProcessingMode getMode()
   {
@@ -71,12 +73,14 @@ public abstract class AbstractHBaseWindowPutOutputOperator<T> extends AbstractHB
     this.mode = mode;
   }
 
-  public AbstractHBaseWindowPutOutputOperator() {
+  public AbstractHBaseWindowPutOutputOperator()
+  {
     store = new HBaseWindowStore();
   }
 
   @Override
-  public void processTuple(T tuple, HTable table) {
+  public void processTuple(T tuple, HTable table)
+  {
     try {
       Put put = operationPut(tuple);
       table.put(put);
@@ -86,14 +90,13 @@ public abstract class AbstractHBaseWindowPutOutputOperator<T> extends AbstractHB
     }
   }
 
-
   public abstract Put operationPut(T t) throws IOException;
 
   @Override
   public void setup(OperatorContext context)
   {
-    mode=context.getValue(context.PROCESSING_MODE);
-    if(mode==ProcessingMode.EXACTLY_ONCE){
+    mode = context.getValue(context.PROCESSING_MODE);
+    if (mode == ProcessingMode.EXACTLY_ONCE) {
       throw new RuntimeException("This operator only supports atmost once and atleast once processing modes");
     }
     super.setup(context);
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperator.java
index 7420569..468dd8c 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -25,27 +25,31 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.hadoop.hbase.client.Put;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.supercsv.io.CsvListReader;
 import org.supercsv.io.ICsvListReader;
 import org.supercsv.prefs.CsvPreference;
+import org.apache.apex.malhar.lib.util.ReusableStringReader;
+import org.apache.hadoop.hbase.client.Put;
 
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.util.ReusableStringReader;
 
 /**
- * Takes a configuration string which tells us about the position of the row, or column.&nbsp; The incoming tuples are inserted accordingly.
+ * Takes a configuration string which tells us about the position of the row, or
+ * column.&nbsp; The incoming tuples are inserted accordingly.
  * <p>
+ *
  * @displayName HBase Csv Mapping Put
  * @category Output
  * @tags hbase, csv, put, String
  * @since 1.0.4
  */
-public class HBaseCsvMappingPutOperator extends AbstractHBaseWindowPutOutputOperator<String> {
-  private class ColDef {
+public class HBaseCsvMappingPutOperator extends AbstractHBaseWindowPutOutputOperator<String>
+{
+  private class ColDef
+  {
     String colFam;
     String colName;
   }
@@ -58,23 +62,26 @@ public class HBaseCsvMappingPutOperator extends AbstractHBaseWindowPutOutputOper
   private transient ArrayList<String> csvLineList = new ArrayList<String>();
   private String mappingString;
 
-  public void setMappingString(String mappingString) {
+  public void setMappingString(String mappingString)
+  {
     this.mappingString = mappingString;
   }
 
   @Override
-  public Put operationPut(String t) throws IOException {
+  public Put operationPut(String t) throws IOException
+  {
     return parseLine(t);
   }
 
-  public void parseMapping() {
+  public void parseMapping()
+  {
     ICsvListReader listReader = null;
     StringReader sr = null;
     ArrayList<String> csvList = new ArrayList<String>();
     try {
       sr = new StringReader(mappingString);
       listReader = new CsvListReader(sr,CsvPreference.STANDARD_PREFERENCE);
-      csvList = (ArrayList<String>) listReader.read();
+      csvList = (ArrayList<String>)listReader.read();
     } catch (IOException e) {
       logger.error("Cannot read the mapping string", e);
       DTThrowable.rethrow(e);
@@ -89,9 +96,9 @@ public class HBaseCsvMappingPutOperator extends AbstractHBaseWindowPutOutputOper
     }
     for (int index = 0; index < csvList.size(); index++) {
       String value = csvList.get(index);
-      if (value.equals("row"))
+      if (value.equals("row")) {
         rowIndex = index;
-      else {
+      } else {
         ColDef c = new ColDef();
         c.colFam = value.substring(0, value.indexOf('.'));
         c.colName = value.substring(value.indexOf('.') + 1);
@@ -100,11 +107,12 @@ public class HBaseCsvMappingPutOperator extends AbstractHBaseWindowPutOutputOper
     }
   }
 
-  public Put parseLine(String s) {
+  public Put parseLine(String s)
+  {
     Put put = null;
     try {
       lineSr.open(s);
-      csvLineList = (ArrayList<String>) lineListReader.read();
+      csvLineList = (ArrayList<String>)lineListReader.read();
     } catch (IOException e) {
       logger.error("Cannot read the property string", e);
       DTThrowable.rethrow(e);
@@ -120,15 +128,17 @@ public class HBaseCsvMappingPutOperator extends AbstractHBaseWindowPutOutputOper
   }
 
   @Override
-  public void setup(OperatorContext context) {
+  public void setup(OperatorContext context)
+  {
     super.setup(context);
     parseMapping();
     lineListReader = new CsvListReader(lineSr,
-        CsvPreference.STANDARD_PREFERENCE);
+    CsvPreference.STANDARD_PREFERENCE);
   }
 
   @Override
-  public void teardown() {
+  public void teardown()
+  {
     super.teardown();
     try {
       lineSr.close();
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldInfo.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldInfo.java
index 6a34a91..23fa2c5 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldInfo.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldInfo.java
@@ -16,96 +16,83 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
+import org.apache.apex.malhar.lib.util.FieldInfo;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.datatorrent.lib.util.FieldInfo;
-
 /**
  * @since 3.1.0
  */
 
 public class HBaseFieldInfo extends FieldInfo
 {
-	private String familyName;
-
-	public HBaseFieldInfo()
-	{
-	}
-
-	public HBaseFieldInfo( String columnName, String columnExpression, SupportType type, String familyName )
-	{
-	  super( columnName, columnExpression, type );
-	  setFamilyName( familyName );
-	}
-
-	public String getFamilyName()
-	{
-		return familyName;
-	}
-
-	public void setFamilyName(String familyName)
-	{
-		this.familyName = familyName;
-	}
+  private String familyName;
 
-	public byte[] toBytes( Object value )
-	{
-		final SupportType type = getType();
-		switch( type )
-		{
-		case BOOLEAN:
-		  return Bytes.toBytes( (Boolean)value );
-
-		case SHORT:
-		  return Bytes.toBytes( (Short)value );
-
-		case INTEGER:
-		  return Bytes.toBytes( (Integer)value );
-
-		case LONG:
-		  return Bytes.toBytes( (Long)value );
+  public HBaseFieldInfo()
+  {
+  }
 
-		case FLOAT:
-		  return Bytes.toBytes( (Float)value );
+  public HBaseFieldInfo( String columnName, String columnExpression, SupportType type, String familyName )
+  {
+    super( columnName, columnExpression, type );
+    setFamilyName( familyName );
+  }
 
-		case DOUBLE:
-		  return Bytes.toBytes( (Double)value );
+  public String getFamilyName()
+  {
+    return familyName;
+  }
 
-		case STRING:
-		  return Bytes.toBytes( (String)value );
-		}
-		throw new IllegalArgumentException( "Unsupported type: " + type );
-	}
+  public void setFamilyName(String familyName)
+  {
+    this.familyName = familyName;
+  }
 
-	public Object toValue( byte[] bytes )
-	{
+  public byte[] toBytes( Object value )
+  {
     final SupportType type = getType();
-    switch( type )
-    {
-    case BOOLEAN:
-      return Bytes.toBoolean( bytes );
-
-    case SHORT:
-      return Bytes.toShort( bytes );
-
-    case INTEGER:
-      return Bytes.toInt( bytes );
-
-    case LONG:
-      return Bytes.toLong( bytes );
-
-    case FLOAT:
-      return Bytes.toFloat( bytes );
-
-    case DOUBLE:
-      return Bytes.toDouble( bytes );
+    switch (type) {
+      case BOOLEAN:
+        return Bytes.toBytes( (Boolean)value );
+      case SHORT:
+        return Bytes.toBytes( (Short)value );
+      case INTEGER:
+        return Bytes.toBytes( (Integer)value );
+      case LONG:
+        return Bytes.toBytes( (Long)value );
+      case FLOAT:
+        return Bytes.toBytes( (Float)value );
+      case DOUBLE:
+        return Bytes.toBytes( (Double)value );
+      case STRING:
+        return Bytes.toBytes( (String)value );
+      default:
+        throw new IllegalArgumentException("Unsupported type: " + type);
+    }
+  }
 
-    case STRING:
-      return Bytes.toString( bytes );
+  public Object toValue( byte[] bytes )
+  {
+    final SupportType type = getType();
+    switch (type) {
+      case BOOLEAN:
+        return Bytes.toBoolean( bytes );
+      case SHORT:
+        return Bytes.toShort( bytes );
+      case INTEGER:
+        return Bytes.toInt( bytes );
+      case LONG:
+        return Bytes.toLong( bytes );
+      case FLOAT:
+        return Bytes.toFloat( bytes );
+      case DOUBLE:
+        return Bytes.toDouble( bytes );
+      case STRING:
+        return Bytes.toString( bytes );
+      default:
+        throw new IllegalArgumentException("Unsupported type: " + type);
     }
-    throw new IllegalArgumentException( "Unsupported type: " + type );
   }
 
 }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldValueGenerator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldValueGenerator.java
index fea56a0..a49399e 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldValueGenerator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldValueGenerator.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.util.List;
 
-import com.datatorrent.lib.util.FieldValueGenerator;
-import com.datatorrent.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.FieldValueGenerator;
+import org.apache.apex.malhar.lib.util.PojoUtils;
 
 /**
  * A {@link FieldValueGenerator} implementation for {@link HBaseFieldInfo}
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperator.java
index 37270d5..12608c8 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.Get;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseInputOperator.java
index 6f11621..82e50b4 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseInputOperator.java
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
+
+import org.apache.apex.malhar.lib.db.AbstractStoreInputOperator;
 
 import com.datatorrent.api.InputOperator;
-import com.datatorrent.lib.db.AbstractStoreInputOperator;
 
 /**
  * A base implementation of hbase input operator which derives from HBaseOperatorBase. <br>
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperator.java
index d35281c..5fd97e1 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperator.java
@@ -16,45 +16,48 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import javax.validation.constraints.NotNull;
 
-import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.netlet.util.DTThrowable;
-import com.datatorrent.lib.util.ReusableStringReader;
-import org.apache.hadoop.hbase.client.Put;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.supercsv.io.CsvListReader;
 import org.supercsv.io.ICsvListReader;
 import org.supercsv.prefs.CsvPreference;
+import org.apache.apex.malhar.lib.util.ReusableStringReader;
+import org.apache.hadoop.hbase.client.Put;
 
-import javax.validation.constraints.NotNull;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import com.datatorrent.api.Context.OperatorContext;
+import com.datatorrent.netlet.util.DTThrowable;
 
 /**
- * An implementation of HBase window put operator that inserts a string of key value pairs which are mapped to corresponding rows, columns.
+ * An implementation of HBase window put operator that inserts a string of key
+ * value pairs which are mapped to corresponding rows, columns.
  * <p>
  * Accepts a string of key value pairs containing the data to be inserted.These
  * are mapped to corresponding rows,column families and columns using a property
  * file and inserted into hbase Example: input string will be of the form
- * name="xyz", st="patrickhenry" ,ct="fremont", sa="california", the properties will contain
- * properties of form name=row, sa=address.street, ct=address.city, sa=address.state.
- * With the above mapping a row xyz is created. The value patrickhenry is inserted into
- * columnfamily address and column street of row xyz. Other values are inserted
- * similarly.
+ * name="xyz", st="patrickhenry" ,ct="fremont", sa="california", the properties
+ * will contain properties of form name=row, sa=address.street, ct=address.city,
+ * sa=address.state. With the above mapping a row xyz is created. The value
+ * patrickhenry is inserted into columnfamily address and column street of row
+ * xyz. Other values are inserted similarly.
  *
  * @displayName HBase Name Value Csv Put
  * @category Output
  * @tags csv, hbase, put
  * @since 1.0.2
  */
-public class HBaseNameValueCsvPutOperator extends AbstractHBaseWindowPutOutputOperator<String> {
-
-  private class ColDef {
+public class HBaseNameValueCsvPutOperator extends AbstractHBaseWindowPutOutputOperator<String>
+{
+  private class ColDef
+  {
     String colFam;
     String colName;
   }
@@ -66,26 +69,29 @@ public class HBaseNameValueCsvPutOperator extends AbstractHBaseWindowPutOutputOp
   private transient Map<String, ColDef> colMap = new HashMap<String, ColDef>();
   private transient Map<String, String> linemap = new HashMap<String, String>();
   private transient ICsvListReader lineListReader = null;
-  private transient ReusableStringReader lineSr=new ReusableStringReader();
+  private transient ReusableStringReader lineSr = new ReusableStringReader();
   private transient ArrayList<String> csvLineList = new ArrayList<String>();
 
-  public void setMapping(String mapping) {
+  public void setMapping(String mapping)
+  {
     this.mapping = mapping;
   }
 
   @Override
-  public Put operationPut(String t) {
+  public Put operationPut(String t)
+  {
     return parseLine(t);
   }
 
-  public void parseMapping() {
+  public void parseMapping()
+  {
     ICsvListReader listReader = null;
-    StringReader sr=null;
+    StringReader sr = null;
     ArrayList<String> csvList = new ArrayList<String>();
     try {
-      sr=new StringReader(mapping);
+      sr = new StringReader(mapping);
       listReader = new CsvListReader(sr,CsvPreference.STANDARD_PREFERENCE);
-      csvList = (ArrayList<String>) listReader.read();
+      csvList = (ArrayList<String>)listReader.read();
     } catch (IOException e) {
       logger.error("Cannot read the mapping string", e);
       DTThrowable.rethrow(e);
@@ -110,11 +116,12 @@ public class HBaseNameValueCsvPutOperator extends AbstractHBaseWindowPutOutputOp
     }
   }
 
-  public Put parseLine(String s) {
+  public Put parseLine(String s)
+  {
     Put put = null;
     try {
       lineSr.open(s);
-      csvLineList = (ArrayList<String>) lineListReader.read();
+      csvLineList = (ArrayList<String>)lineListReader.read();
     } catch (IOException e) {
       logger.error("Cannot read the property string", e);
       DTThrowable.rethrow(e);
@@ -144,14 +151,16 @@ public class HBaseNameValueCsvPutOperator extends AbstractHBaseWindowPutOutputOp
   }
 
   @Override
-  public void setup(OperatorContext context) {
+  public void setup(OperatorContext context)
+  {
     super.setup(context);
     parseMapping();
     lineListReader = new CsvListReader(lineSr,CsvPreference.STANDARD_PREFERENCE);
   }
 
   @Override
-  public void teardown() {
+  public void teardown()
+  {
     super.teardown();
     try {
       lineSr.close();
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseOperatorBase.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseOperatorBase.java
index 8bed824..04a51b4 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseOperatorBase.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseOperatorBase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.IOException;
 import org.apache.hadoop.conf.Configuration;
@@ -103,7 +103,8 @@ public class HBaseOperatorBase
    * Get the configuration.
    * @return The configuration
    */
-  public Configuration getConfiguration() {
+  public Configuration getConfiguration()
+  {
     return configuration;
   }
 
@@ -113,7 +114,8 @@ public class HBaseOperatorBase
    * should be called before using the configuration or table.
    * @throws IOException
    */
-  protected void setupConfiguration() throws IOException {
+  protected void setupConfiguration() throws IOException
+  {
     configuration = HBaseConfiguration.create();
     configuration.set("hbase.zookeeper.quorum", zookeeperQuorum);
     configuration.set("hbase.zookeeper.property.clientPort", "" + zookeeperClientPort);
@@ -127,7 +129,8 @@ public class HBaseOperatorBase
    * @return The HBase table if configuration setup was successful, null otherwise
    * @throws IOException
    */
-  protected HTable getTable() throws IOException {
+  protected HTable getTable() throws IOException
+  {
     return table;
   }
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperator.java
index e459ec7..cb36dbf 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperator.java
@@ -16,12 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import org.apache.apex.malhar.lib.util.FieldValueGenerator;
+import org.apache.apex.malhar.lib.util.FieldValueGenerator.ValueConverter;
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Setter;
+import org.apache.apex.malhar.lib.util.TableInfo;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
@@ -29,14 +35,8 @@ import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.datatorrent.lib.util.FieldValueGenerator;
-import com.datatorrent.lib.util.FieldValueGenerator.ValueConverter;
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.Setter;
-import com.datatorrent.lib.util.TableInfo;
 import com.datatorrent.api.Context;
 import com.datatorrent.api.DefaultOutputPort;
-import com.datatorrent.api.Context.OperatorContext;
 
 /**
  * HBasePOJOInputOperator reads data from a HBase store, converts it to a POJO and puts it on the output port.
@@ -96,20 +96,20 @@ public class HBasePOJOInputOperator extends HBaseScanOperator<Object>
   {
     try {
       String readRow = Bytes.toString(result.getRow());
-      if( readRow.equals( getLastReadRow() )) {
+      if ( readRow.equals( getLastReadRow() )) {
         return null;
       }
 
       Object instance = pojoType.newInstance();
       rowSetter.set(instance, readRow);
 
-       List<Cell> cells = result.listCells();
-       for (Cell cell : cells) {
-         String columnName = Bytes.toString(CellUtil.cloneQualifier(cell));
-         String columnFamily = Bytes.toString(CellUtil.cloneFamily(cell));
+      List<Cell> cells = result.listCells();
+      for (Cell cell : cells) {
+        String columnName = Bytes.toString(CellUtil.cloneQualifier(cell));
+        String columnFamily = Bytes.toString(CellUtil.cloneFamily(cell));
         byte[] value = CellUtil.cloneValue(cell);
-         ((HBaseFieldValueGenerator)fieldValueGenerator).setColumnValue(instance, columnName, columnFamily, value,
-             valueConverter);
+        ((HBaseFieldValueGenerator)fieldValueGenerator).setColumnValue(instance, columnName, columnFamily, value,
+            valueConverter);
       }
 
       setLastReadRow(readRow);
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperator.java
index 37c962b..d70f3c7 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperator.java
@@ -16,20 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.util.List;
 
+import org.apache.apex.malhar.lib.util.FieldValueGenerator;
+import org.apache.apex.malhar.lib.util.FieldValueGenerator.FieldValueHandler;
+import org.apache.apex.malhar.lib.util.PojoUtils;
+import org.apache.apex.malhar.lib.util.PojoUtils.Getter;
+import org.apache.apex.malhar.lib.util.TableInfo;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.util.Bytes;
 
-import com.datatorrent.lib.util.FieldValueGenerator;
-import com.datatorrent.lib.util.FieldValueGenerator.FieldValueHandler;
-import com.datatorrent.lib.util.PojoUtils;
-import com.datatorrent.lib.util.PojoUtils.Getter;
-import com.datatorrent.lib.util.TableInfo;
-
 /**
  * @displayName HBase Output Operator
  * @category Output
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperator.java
index b694e67..f525058 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperator.java
@@ -16,36 +16,38 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.IOException;
 import java.util.Queue;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.client.Scan;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Scan;
 
+import com.google.common.collect.Queues;
 import com.datatorrent.api.AutoMetric;
 import com.datatorrent.api.Context;
-import com.datatorrent.api.Operator;
 import com.datatorrent.api.Context.OperatorContext;
-import com.google.common.collect.Queues;
-
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.ResultScanner;
+import com.datatorrent.api.Operator;
 
 /**
- * A base implementation of hbase input operator that retrieves tuples from HBase columns and provides scan operation. <br>
+ * A base implementation of hbase input operator that retrieves tuples from
+ * HBase columns and provides scan operation. <br>
  * <p>
  * <br>
- * This class provides a HBase input operator that can be used to retrieve tuples from rows in a
- * HBase table. The class should be extended by the end-operator developer. The extending class should
- * implement operationScan and getTuple methods. The operationScan method should provide a HBase Scan
- * metric object that specifies where to retrieve the tuple information from the table. The getTuple method
- * should map the contents of a Result from the Scan result to a tuple.<br>
+ * This class provides a HBase input operator that can be used to retrieve
+ * tuples from rows in a HBase table. The class should be extended by the
+ * end-operator developer. The extending class should implement operationScan
+ * and getTuple methods. The operationScan method should provide a HBase Scan
+ * metric object that specifies where to retrieve the tuple information from the
+ * table. The getTuple method should map the contents of a Result from the Scan
+ * result to a tuple.<br>
  *
  * <br>
+ *
  * @displayName HBase Scan
  * @category Output
  * @tags hbase, scan, input operator
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseStore.java
index 2b0ffa7..d46bc6f 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseStore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -27,6 +27,7 @@ import javax.validation.constraints.Min;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.db.Connectable;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -41,7 +42,6 @@ import com.google.common.cache.LoadingCache;
 import com.google.common.cache.RemovalListener;
 import com.google.common.cache.RemovalNotification;
 
-import com.datatorrent.lib.db.Connectable;
 /**
  * A {@link Connectable} that uses HBase to connect to stores and implements Connectable interface.
  * <p>
@@ -50,15 +50,15 @@ import com.datatorrent.lib.db.Connectable;
  * @tags store, hbase
  * @since 1.0.2
  */
-public class HBaseStore implements Connectable {
-
+public class HBaseStore implements Connectable
+{
   public static final String USER_NAME_SPECIFIER = "%USER_NAME%";
 
   private static final Logger logger = LoggerFactory.getLogger(HBaseStore.class);
 
   private String zookeeperQuorum;
   private int zookeeperClientPort;
-  
+
   // Default table name if specified
   protected String tableName;
 
@@ -67,7 +67,7 @@ public class HBaseStore implements Connectable {
   // Default interval 30 min
   protected long reloginCheckInterval = 30 * 60 * 1000;
   protected transient Thread loginRenewer;
-  private volatile transient boolean doRelogin;
+  private transient volatile boolean doRelogin;
 
   protected transient HTable table;
   // Multi - table
@@ -76,13 +76,14 @@ public class HBaseStore implements Connectable {
 
   @Min(1)
   protected int maxOpenTables = Integer.MAX_VALUE;
-  
+
   /**
    * Get the zookeeper quorum location.
    *
    * @return The zookeeper quorum location
    */
-  public String getZookeeperQuorum() {
+  public String getZookeeperQuorum()
+  {
     return zookeeperQuorum;
   }
 
@@ -92,7 +93,8 @@ public class HBaseStore implements Connectable {
    * @param zookeeperQuorum
    *            The zookeeper quorum location
    */
-  public void setZookeeperQuorum(String zookeeperQuorum) {
+  public void setZookeeperQuorum(String zookeeperQuorum)
+  {
     this.zookeeperQuorum = zookeeperQuorum;
   }
 
@@ -101,7 +103,8 @@ public class HBaseStore implements Connectable {
    *
    * @return The zookeeper client port
    */
-  public int getZookeeperClientPort() {
+  public int getZookeeperClientPort()
+  {
     return zookeeperClientPort;
   }
 
@@ -111,7 +114,8 @@ public class HBaseStore implements Connectable {
    * @param zookeeperClientPort
    *            The zookeeper client port
    */
-  public void setZookeeperClientPort(int zookeeperClientPort) {
+  public void setZookeeperClientPort(int zookeeperClientPort)
+  {
     this.zookeeperClientPort = zookeeperClientPort;
   }
 
@@ -120,7 +124,8 @@ public class HBaseStore implements Connectable {
    *
    * @return The HBase table name
    */
-  public String getTableName() {
+  public String getTableName()
+  {
     return tableName;
   }
 
@@ -130,7 +135,8 @@ public class HBaseStore implements Connectable {
    * @param tableName
    *            The HBase table name
    */
-  public void setTableName(String tableName) {
+  public void setTableName(String tableName)
+  {
     this.tableName = tableName;
   }
 
@@ -199,8 +205,8 @@ public class HBaseStore implements Connectable {
 
   /**
    * Gets the allowedtableNames
-   * 
-   * @return  allowedTableNames 
+   *
+   * @return  allowedTableNames
    */
   public String[] getAllowedTableNames()
   {
@@ -211,14 +217,15 @@ public class HBaseStore implements Connectable {
   {
     this.allowedTableNames = allowedTableNames;
   }
-  
+
   /**
    * Get the HBase table .
    *
    * @return The HBase table
    * @omitFromUI
    */
-  public HTable getTable() {
+  public HTable getTable()
+  {
     return table;
   }
 
@@ -230,16 +237,18 @@ public class HBaseStore implements Connectable {
    * @return The HBase table
    * @omitFromUI
    */
-  public HTable getTable(String tableName) {
-    if ((tableName == null) || tableName.equals(this.tableName))
+  public HTable getTable(String tableName)
+  {
+    if ((tableName == null) || tableName.equals(this.tableName)) {
       return getTable();
+    }
     try {
       return tableCache.get(tableName);
     } catch (Exception e) {
       throw Throwables.propagate(e);
     }
   }
-  
+
   public void flushTables() throws InterruptedIOException, RetriesExhaustedWithDetailsException
   {
     if (table != null) {
@@ -249,7 +258,7 @@ public class HBaseStore implements Connectable {
       flushTable(entry.getValue());
     }
   }
-  
+
   protected void flushTable(HTable table) throws InterruptedIOException, RetriesExhaustedWithDetailsException
   {
     table.flushCommits();
@@ -260,7 +269,8 @@ public class HBaseStore implements Connectable {
    *
    * @return The configuration
    */
-  public Configuration getConfiguration() {
+  public Configuration getConfiguration()
+  {
     return configuration;
   }
 
@@ -270,14 +280,16 @@ public class HBaseStore implements Connectable {
    * @param configuration
    *            The configuration
    */
-  public void setConfiguration(Configuration configuration) {
+  public void setConfiguration(Configuration configuration)
+  {
     this.configuration = configuration;
   }
 
   protected transient Configuration configuration;
 
   @Override
-  public void connect() throws IOException {
+  public void connect() throws IOException
+  {
     if ((principal != null) && (keytabPath != null)) {
       String lprincipal = evaluateProperty(principal);
       String lkeytabPath = evaluateProperty(keytabPath);
@@ -317,12 +329,12 @@ public class HBaseStore implements Connectable {
     if (zookeeperClientPort != 0) {
       configuration.set("hbase.zookeeper.property.clientPort", "" + zookeeperClientPort);
     }
-    
+
     // Connect to default table if specified
     if (tableName != null) {
       table = connectTable(tableName);
     }
-    
+
     CacheLoader<String, HTable> cacheLoader = new CacheLoader<String, HTable>()
     {
       @Override
@@ -331,7 +343,7 @@ public class HBaseStore implements Connectable {
         return loadTable(key);
       }
     };
-    
+
     RemovalListener<String, HTable> removalListener = new RemovalListener<String, HTable>()
     {
       @Override
@@ -340,9 +352,9 @@ public class HBaseStore implements Connectable {
         unloadTable(notification.getValue());
       }
     };
-    
+
     int maxCacheSize = (tableName == null) ? maxOpenTables : (maxOpenTables - 1);
-    
+
     tableCache = CacheBuilder.<String, HTable>newBuilder().maximumSize(maxCacheSize).removalListener(removalListener).build(cacheLoader);
   }
 
@@ -362,7 +374,7 @@ public class HBaseStore implements Connectable {
       logger.warn("Could not close table", e);
     }
   }
-  
+
   protected HTable connectTable(String tableName) throws IOException
   {
     HTable table = new HTable(configuration, tableName);
@@ -373,13 +385,14 @@ public class HBaseStore implements Connectable {
   private String evaluateProperty(String property) throws IOException
   {
     if (property.contains(USER_NAME_SPECIFIER)) {
-     property = property.replaceAll(USER_NAME_SPECIFIER, UserGroupInformation.getLoginUser().getShortUserName());
+      property = property.replaceAll(USER_NAME_SPECIFIER, UserGroupInformation.getLoginUser().getShortUserName());
     }
     return property;
   }
 
   @Override
-  public void disconnect() throws IOException {
+  public void disconnect() throws IOException
+  {
     if (loginRenewer != null) {
       doRelogin = false;
       loginRenewer.interrupt();
@@ -392,7 +405,8 @@ public class HBaseStore implements Connectable {
   }
 
   @Override
-  public boolean isConnected() {
+  public boolean isConnected()
+  {
     // not applicable to hbase
     return false;
   }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseWindowStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseWindowStore.java
index 2c9f539..38d6195 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseWindowStore.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseWindowStore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -24,6 +24,7 @@ import java.io.InterruptedIOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.apex.malhar.lib.db.TransactionableStore;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.KeyValue;
@@ -36,8 +37,8 @@ import org.apache.hadoop.hbase.util.Bytes;
 
 import com.google.common.base.Throwables;
 
-import com.datatorrent.lib.db.TransactionableStore;
 import com.datatorrent.netlet.util.DTThrowable;
+
 /**
  * <p>Provides transaction support to the operators by implementing TransactionableStore abstract methods. </p>
  * <p>
@@ -49,7 +50,8 @@ import com.datatorrent.netlet.util.DTThrowable;
  * @tags store, transactional
  * @since 1.0.2
  */
-public class HBaseWindowStore extends HBaseStore implements TransactionableStore {
+public class HBaseWindowStore extends HBaseStore implements TransactionableStore
+{
   private static final transient Logger logger = LoggerFactory.getLogger(HBaseWindowStore.class);
   private static final String DEFAULT_ROW_NAME = "HBaseOperator_row";
   private static final String DEFAULT_COLUMN_FAMILY_NAME = "HBaseOutputOperator_cf";
@@ -63,14 +65,16 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
   private transient String lastWindowColumnName;
   private transient byte[] lastWindowColumnBytes;
 
-  public HBaseWindowStore() {
+  public HBaseWindowStore()
+  {
     rowName = DEFAULT_ROW_NAME;
     columnFamilyName = DEFAULT_COLUMN_FAMILY_NAME;
     lastWindowColumnName = DEFAULT_LAST_WINDOW_PREFIX_COLUMN_NAME;
     constructKeys();
   }
 
-  private void constructKeys() {
+  private void constructKeys()
+  {
     rowBytes = Bytes.toBytes(rowName);
     columnFamilyBytes = Bytes.toBytes(columnFamilyName);
   }
@@ -80,7 +84,8 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
    *
    * @return The row name
    */
-  public String getRowName() {
+  public String getRowName()
+  {
     return rowName;
   }
 
@@ -90,7 +95,8 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
    * @param rowName
    *            The row name
    */
-  public void setRowName(String rowName) {
+  public void setRowName(String rowName)
+  {
     this.rowName = rowName;
     constructKeys();
   }
@@ -100,7 +106,8 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
    *
    * @return The column family name
    */
-  public String getColumnFamilyName() {
+  public String getColumnFamilyName()
+  {
     return columnFamilyName;
   }
 
@@ -110,13 +117,15 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
    * @param columnFamilyName
    *            The column family name
    */
-  public void setColumnFamilyName(String columnFamilyName) {
+  public void setColumnFamilyName(String columnFamilyName)
+  {
     this.columnFamilyName = columnFamilyName;
     constructKeys();
   }
 
   @Override
-  public void connect() throws IOException {
+  public void connect() throws IOException
+  {
     super.connect();
     HTableDescriptor tdesc = table.getTableDescriptor();
     if (!tdesc.hasFamily(columnFamilyBytes)) {
@@ -133,13 +142,14 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
   }
 
   @Override
-  public void beginTransaction() {
+  public void beginTransaction()
+  {
     // HBase does not support transactions so this method left empty
-
   }
 
   @Override
-  public void commitTransaction() {
+  public void commitTransaction()
+  {
     try {
       flushTables();
     } catch (InterruptedIOException | RetriesExhaustedWithDetailsException e) {
@@ -148,19 +158,21 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
   }
 
   @Override
-  public void rollbackTransaction() {
+  public void rollbackTransaction()
+  {
     // HBase does not support transactions so this method left empty
-
   }
 
   @Override
-  public boolean isInTransaction() {
+  public boolean isInTransaction()
+  {
     // HBase does not support transactions so this method left empty
     return false;
   }
 
   @Override
-  public long getCommittedWindowId(String appId, int operatorId) {
+  public long getCommittedWindowId(String appId, int operatorId)
+  {
     byte[] value = null;
     try {
       String columnKey = appId + "_" + operatorId + "_" + lastWindowColumnName;
@@ -183,12 +195,14 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
     if (value != null) {
       long longval = Bytes.toLong(value);
       return longval;
-    } else
+    } else {
       return -1;
+    }
   }
 
   @Override
-  public void storeCommittedWindowId(String appId, int operatorId,long windowId) {
+  public void storeCommittedWindowId(String appId, int operatorId,long windowId)
+  {
     byte[] WindowIdBytes = Bytes.toBytes(windowId);
     String columnKey = appId + "_" + operatorId + "_" + lastWindowColumnName;
     lastWindowColumnBytes = Bytes.toBytes(columnKey);
@@ -206,7 +220,8 @@ public class HBaseWindowStore extends HBaseStore implements TransactionableStore
   }
 
   @Override
-  public void removeCommittedWindowId(String appId, int operatorId) {
+  public void removeCommittedWindowId(String appId, int operatorId)
+  {
     // Not applicable to hbase
   }
 
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/OutputAdapter.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/OutputAdapter.java
similarity index 98%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/OutputAdapter.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/OutputAdapter.java
index 31317bd..e503ebb 100644
--- a/contrib/src/main/java/com/datatorrent/contrib/hbase/OutputAdapter.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/OutputAdapter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
 
 import java.io.InterruptedIOException;
 
@@ -75,7 +75,9 @@ public class OutputAdapter<T>
   interface Driver<T>
   {
     void processTuple(T tuple, HTable table);
+
     String getTableName(T tuple);
+
     void errorTuple(T tuple);
   }
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/package-info.java
index 0ccd6c2..2df5c10 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/package-info.java
@@ -20,4 +20,4 @@
  * HBase operators and utilities.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.hbase;
+package org.apache.apex.malhar.contrib.hbase;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/PythonOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/PythonOperator.java
index a6fb42f..997c890 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/PythonOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/PythonOperator.java
@@ -16,17 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.jython;
-
-import com.datatorrent.api.Context.OperatorContext;
-import com.datatorrent.lib.script.ScriptOperator;
-import org.python.core.*;
-import org.python.util.PythonInterpreter;
+package org.apache.apex.malhar.contrib.jython;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.python.core.PyCode;
+import org.python.core.PyIterator;
+import org.python.core.PyObject;
+import org.python.core.PyStringMap;
+import org.python.core.PyTuple;
+import org.python.util.PythonInterpreter;
+
+import org.apache.apex.malhar.lib.script.ScriptOperator;
+
+import com.datatorrent.api.Context.OperatorContext;
+
 /**
  * An operator that executes a python script and passes the input as bindings.
  * <p></p>
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/package-info.java
index 08b3a3e..9fc7de7 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/package-info.java
@@ -17,4 +17,4 @@
  * under the License.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.jython;
+package org.apache.apex.malhar.contrib.jython;
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java
index b11c8ef..ec082d1 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java
@@ -16,12 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.kafka;
+package org.apache.apex.malhar.contrib.kafka;
 
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Sets;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.common.util.Pair;
-import com.google.common.collect.Sets;
 import kafka.api.FetchRequest;
 import kafka.api.FetchRequestBuilder;
 import kafka.javaapi.FetchResponse;
@@ -32,13 +39,6 @@ import kafka.message.Message;
 import kafka.message.MessageAndOffset;
 import kafka.producer.KeyedMessage;
 import kafka.producer.Partitioner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-
 
 /**
  * This is a base implementation of a Kafka output operator,
@@ -82,7 +82,6 @@ import java.util.Map;
  */
 public abstract class AbstractExactlyOnceKafkaOutputOperator<T, K, V> extends AbstractKafkaOutputOperator<K, V>
 {
-
   private Map<Integer, Pair<byte[], byte[]>>  lastMsgs;
 
   private transient  Partitioner partitioner;
@@ -94,9 +93,9 @@ public abstract class AbstractExactlyOnceKafkaOutputOperator<T, K, V> extends Ab
   {
     super.setup(context);
     try {
-      String className = (String) getConfigProperties().get(KafkaMetadataUtil.PRODUCER_PROP_PARTITIONER);
+      String className = (String)getConfigProperties().get(KafkaMetadataUtil.PRODUCER_PROP_PARTITIONER);
       if (className != null) {
-        partitioner = (Partitioner) Class.forName(className).newInstance();
+        partitioner = (Partitioner)Class.forName(className).newInstance();
       }
     } catch (Exception e) {
       throw new RuntimeException("Failed to initialize partitioner", e);
@@ -108,22 +107,22 @@ public abstract class AbstractExactlyOnceKafkaOutputOperator<T, K, V> extends Ab
   /**
    * This input port receives tuples that will be written out to Kafka.
    */
-  public final transient DefaultInputPort<T> inputPort = new DefaultInputPort<T>() {
+  public final transient DefaultInputPort<T> inputPort = new DefaultInputPort<T>()
+  {
     @Override
     public void process(T tuple)
     {
       Pair<K, V> keyValue = tupleToKeyValue(tuple);
       int pid = 0;
 
-      if(partitioner!=null){
+      if (partitioner != null) {
         pid = partitioner.partition(keyValue.first, partitionNum);
       }
 
       Pair<byte[], byte[]> lastMsg = lastMsgs.get(pid);
-
-      if(lastMsg == null || compareToLastMsg(keyValue, lastMsg) > 0){
+      if (lastMsg == null || compareToLastMsg(keyValue, lastMsg) > 0) {
         getProducer().send(new KeyedMessage<K, V>(getTopic(), keyValue.first, keyValue.second));
-        sendCount ++;
+        sendCount++;
       } else {
         // ignore tuple because kafka has already had the tuple
         logger.debug("Ingore tuple " + tuple);
@@ -134,7 +133,6 @@ public abstract class AbstractExactlyOnceKafkaOutputOperator<T, K, V> extends Ab
 
   private void initializeLastProcessingOffset()
   {
-
     // read last received kafka message
     TopicMetadata tm = KafkaMetadataUtil.getTopicMetadata(Sets.newHashSet((String)getConfigProperties().get(KafkaMetadataUtil.PRODUCER_PROP_BROKERLIST)), this.getTopic());
 
@@ -170,9 +168,7 @@ public abstract class AbstractExactlyOnceKafkaOutputOperator<T, K, V> extends Ab
         key.get(keyBytes);
         lastMsgs.put(pm.partitionId(), new Pair<byte[], byte[]>(keyBytes, valueBytes));
       }
-
     }
-
   }
 
   /**
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaInputOperator.java
index 1218f4a..9130923 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaInputOperator.java
@@ -16,7 +16,35 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.kafka;
+package org.apache.apex.malhar.contrib.kafka;
+
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.apex.malhar.lib.util.KryoCloneUtils;
+import org.apache.apex.malhar.lib.wal.WindowDataManager;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.MutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultPartition;
@@ -28,10 +56,6 @@ import com.datatorrent.api.Stats;
 import com.datatorrent.api.StatsListener;
 import com.datatorrent.api.annotation.OperatorAnnotation;
 import com.datatorrent.api.annotation.Stateless;
-import com.datatorrent.lib.util.KryoCloneUtils;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 
 import kafka.api.FetchRequest;
 import kafka.api.FetchRequestBuilder;
@@ -42,30 +66,7 @@ import kafka.javaapi.consumer.SimpleConsumer;
 import kafka.message.Message;
 import kafka.message.MessageAndOffset;
 
-import org.apache.apex.malhar.lib.wal.WindowDataManager;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.MutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static com.datatorrent.contrib.kafka.KafkaConsumer.KafkaMeterStatsUtil.getOffsetsForPartitions;
+import static org.apache.apex.malhar.contrib.kafka.KafkaConsumer.KafkaMeterStatsUtil.getOffsetsForPartitions;
 
 /**
  * This is a base implementation of a Kafka input operator, which consumes data from Kafka message bus.&nbsp;
@@ -226,7 +227,8 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
    * processing of messages doesn't get stuck.
    * @return The maximum for the total size
      */
-  public long getMaxTotalMsgSizePerWindow() {
+  public long getMaxTotalMsgSizePerWindow()
+  {
     return maxTotalMsgSizePerWindow;
   }
 
@@ -236,7 +238,8 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
    *
    * @param maxTotalMsgSizePerWindow The maximum for the total size
      */
-  public void setMaxTotalMsgSizePerWindow(long maxTotalMsgSizePerWindow) {
+  public void setMaxTotalMsgSizePerWindow(long maxTotalMsgSizePerWindow)
+  {
     this.maxTotalMsgSizePerWindow = maxTotalMsgSizePerWindow;
   }
 
@@ -256,7 +259,7 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
     }
     this.context = context;
     operatorId = context.getId();
-    if(consumer instanceof HighlevelKafkaConsumer && !(windowDataManager instanceof WindowDataManager.NoopWindowDataManager)) {
+    if (consumer instanceof HighlevelKafkaConsumer && !(windowDataManager instanceof WindowDataManager.NoopWindowDataManager)) {
       throw new RuntimeException("Idempotency is not supported for High Level Kafka Consumer");
     }
     windowDataManager.setup(context);
@@ -289,7 +292,7 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
       if (recoveredData != null) {
         Map<String, List<PartitionMetadata>> pms = KafkaMetadataUtil.getPartitionsForTopic(getConsumer().brokers, getConsumer().topic);
         if (pms != null) {
-          SimpleKafkaConsumer cons = (SimpleKafkaConsumer) getConsumer();
+          SimpleKafkaConsumer cons = (SimpleKafkaConsumer)getConsumer();
           // add all partition request in one Fretch request together
           FetchRequestBuilder frb = new FetchRequestBuilder().clientId(cons.getClientId());
           for (Map.Entry<KafkaPartition, MutablePair<Long, Integer>> rc : recoveredData.entrySet()) {
@@ -299,13 +302,14 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
             Iterator<PartitionMetadata> pmIterator = pmsVal.iterator();
             PartitionMetadata pm = pmIterator.next();
             while (pm.partitionId() != kp.getPartitionId()) {
-              if (!pmIterator.hasNext())
+              if (!pmIterator.hasNext()) {
                 break;
+              }
               pm = pmIterator.next();
             }
-            if (pm.partitionId() != kp.getPartitionId())
+            if (pm.partitionId() != kp.getPartitionId()) {
               continue;
-
+            }
             Broker bk = pm.leader();
 
             frb.addFetch(consumer.topic, rc.getKey().getPartitionId(), rc.getValue().left, cons.getBufferSize());
@@ -319,13 +323,14 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
               emitTuple(kafkaMessage);
               offsetStats.put(kp, msg.offset());
               count = count + 1;
-              if (count.equals(rc.getValue().right))
+              if (count.equals(rc.getValue().right)) {
                 break;
+              }
             }
           }
         }
       }
-      if(windowId == windowDataManager.getLargestCompletedWindow()) {
+      if (windowId == windowDataManager.getLargestCompletedWindow()) {
         // Start the consumer at the largest recovery window
         SimpleKafkaConsumer cons = (SimpleKafkaConsumer)getConsumer();
         // Set the offset positions to the consumer
@@ -337,8 +342,7 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
         cons.resetOffset(currentOffsets);
         cons.start();
       }
-    }
-    catch (IOException e) {
+    } catch (IOException e) {
       throw new RuntimeException("replay", e);
     }
   }
@@ -354,8 +358,7 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
     if (currentWindowId > windowDataManager.getLargestCompletedWindow()) {
       try {
         windowDataManager.save(currentWindowRecoveryState, currentWindowId);
-      }
-      catch (IOException e) {
+      } catch (IOException e) {
         throw new RuntimeException("saving recovery", e);
       }
     }
@@ -397,8 +400,7 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
 
     try {
       windowDataManager.committed(windowId);
-    }
-    catch (IOException e) {
+    } catch (IOException e) {
       throw new RuntimeException("deleting state", e);
     }
   }
@@ -453,10 +455,10 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
       emitTotalMsgSize += message.msg.size();
       offsetStats.put(message.kafkaPart, message.offSet);
       MutablePair<Long, Integer> offsetAndCount = currentWindowRecoveryState.get(message.kafkaPart);
-      if(offsetAndCount == null) {
+      if (offsetAndCount == null) {
         currentWindowRecoveryState.put(message.kafkaPart, new MutablePair<Long, Integer>(message.offSet, 1));
       } else {
-        offsetAndCount.setRight(offsetAndCount.right+1);
+        offsetAndCount.setRight(offsetAndCount.right + 1);
       }
     }
   }
@@ -507,7 +509,7 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
 
     boolean isInitialParitition = true;
     // check if it's the initial partition
-    if(partitions.iterator().hasNext()) {
+    if (partitions.iterator().hasNext()) {
       isInitialParitition = partitions.iterator().next().getStats() == null;
     }
 
@@ -516,7 +518,7 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
 
     // initialize the offset
     Map<KafkaPartition, Long> initOffset = null;
-    if(isInitialParitition && offsetManager !=null){
+    if (isInitialParitition && offsetManager != null) {
       initOffset = offsetManager.loadInitialOffsets();
       logger.info("Initial offsets: {} ", "{ " + Joiner.on(", ").useForNull("").withKeyValueSeparator(": ").join(initOffset) + " }");
     }
@@ -527,95 +529,92 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
 
     switch (strategy) {
 
-    // For the 1 to 1 mapping The framework will create number of operator partitions based on kafka topic partitions
-    // Each operator partition will consume from only one kafka partition
-    case ONE_TO_ONE:
-
-      if (isInitialParitition) {
-        lastRepartitionTime = System.currentTimeMillis();
-        logger.info("[ONE_TO_ONE]: Initializing partition(s)");
-        // get partition metadata for topics.
-        // Whatever operator is using high-level or simple kafka consumer, the operator always create a temporary simple kafka consumer to get the metadata of the topic
-        // The initial value of brokerList of the KafkaConsumer is used to retrieve the topic metadata
-        Map<String, List<PartitionMetadata>> kafkaPartitions = KafkaMetadataUtil.getPartitionsForTopic(getConsumer().brokers, getConsumer().getTopic());
-
-        // initialize the number of operator partitions according to number of kafka partitions
-
-        newPartitions = new LinkedList<Partitioner.Partition<AbstractKafkaInputOperator<K>>>();
-        for (Map.Entry<String, List<PartitionMetadata>> kp : kafkaPartitions.entrySet()) {
-          String clusterId = kp.getKey();
-          for (PartitionMetadata pm : kp.getValue()) {
-            logger.info("[ONE_TO_ONE]: Create operator partition for cluster {}, topic {}, kafka partition {} ", clusterId, getConsumer().topic, pm.partitionId());
-            newPartitions.add(createPartition(Sets.newHashSet(new KafkaPartition(clusterId, consumer.topic, pm.partitionId())), initOffset));
+      // For the 1 to 1 mapping The framework will create number of operator partitions based on kafka topic partitions
+      // Each operator partition will consume from only one kafka partition
+      case ONE_TO_ONE:
+
+        if (isInitialParitition) {
+          lastRepartitionTime = System.currentTimeMillis();
+          logger.info("[ONE_TO_ONE]: Initializing partition(s)");
+          // get partition metadata for topics.
+          // Whatever operator is using high-level or simple kafka consumer, the operator always create a temporary simple kafka consumer to get the metadata of the topic
+          // The initial value of brokerList of the KafkaConsumer is used to retrieve the topic metadata
+          Map<String, List<PartitionMetadata>> kafkaPartitions = KafkaMetadataUtil.getPartitionsForTopic(getConsumer().brokers, getConsumer().getTopic());
+
+          // initialize the number of operator partitions according to number of kafka partitions
+
+          newPartitions = new LinkedList<Partitioner.Partition<AbstractKafkaInputOperator<K>>>();
+          for (Map.Entry<String, List<PartitionMetadata>> kp : kafkaPartitions.entrySet()) {
+            String clusterId = kp.getKey();
+            for (PartitionMetadata pm : kp.getValue()) {
+              logger.info("[ONE_TO_ONE]: Create operator partition for cluster {}, topic {}, kafka partition {} ", clusterId, getConsumer().topic, pm.partitionId());
+              newPartitions.add(createPartition(Sets.newHashSet(new KafkaPartition(clusterId, consumer.topic, pm.partitionId())), initOffset));
+            }
+          }
+          resultPartitions = newPartitions;
+          numPartitionsChanged = true;
+        } else if (newWaitingPartition.size() != 0) {
+          // add partition for new kafka partition
+          for (KafkaPartition newPartition : newWaitingPartition) {
+            logger.info("[ONE_TO_ONE]: Add operator partition for cluster {}, topic {}, partition {}", newPartition.getClusterId(), getConsumer().topic, newPartition.getPartitionId());
+            partitions.add(createPartition(Sets.newHashSet(newPartition), null));
           }
+          newWaitingPartition.clear();
+          resultPartitions = partitions;
+          numPartitionsChanged = true;
         }
-        resultPartitions = newPartitions;
-        numPartitionsChanged = true;
-      }
-      else if (newWaitingPartition.size() != 0) {
-        // add partition for new kafka partition
-        for (KafkaPartition newPartition : newWaitingPartition) {
-          logger.info("[ONE_TO_ONE]: Add operator partition for cluster {}, topic {}, partition {}", newPartition.getClusterId(), getConsumer().topic, newPartition.getPartitionId());
-          partitions.add(createPartition(Sets.newHashSet(newPartition), null));
+        break;
+      // For the 1 to N mapping The initial partition number is defined by stream application
+      // Afterwards, the framework will dynamically adjust the partition and allocate consumers to as less operator partitions as it can
+      //  and guarantee the total intake rate for each operator partition is below some threshold
+      case ONE_TO_MANY:
+
+        if (getConsumer() instanceof HighlevelKafkaConsumer) {
+          throw new UnsupportedOperationException("[ONE_TO_MANY]: The high-level consumer is not supported for ONE_TO_MANY partition strategy.");
         }
-        newWaitingPartition.clear();
-        resultPartitions = partitions;
-        numPartitionsChanged = true;
-      }
-      break;
-    // For the 1 to N mapping The initial partition number is defined by stream application
-    // Afterwards, the framework will dynamically adjust the partition and allocate consumers to as less operator partitions as it can
-    //  and guarantee the total intake rate for each operator partition is below some threshold
-    case ONE_TO_MANY:
-
-      if (getConsumer() instanceof HighlevelKafkaConsumer) {
-        throw new UnsupportedOperationException("[ONE_TO_MANY]: The high-level consumer is not supported for ONE_TO_MANY partition strategy.");
-      }
 
-      if (isInitialParitition || newWaitingPartition.size() != 0) {
-        lastRepartitionTime = System.currentTimeMillis();
-        logger.info("[ONE_TO_MANY]: Initializing partition(s)");
-        // get partition metadata for topics.
-        // Whatever operator is using high-level or simple kafka consumer, the operator always create a temporary simple kafka consumer to get the metadata of the topic
-        // The initial value of brokerList of the KafkaConsumer is used to retrieve the topic metadata
-        Map<String, List<PartitionMetadata>> kafkaPartitions = KafkaMetadataUtil.getPartitionsForTopic(getConsumer().brokers, getConsumer().getTopic());
-
-        int size = initialPartitionCount;
-        @SuppressWarnings("unchecked")
-        Set<KafkaPartition>[] kps = (Set<KafkaPartition>[]) Array.newInstance((new HashSet<KafkaPartition>()).getClass(), size);
-        int i = 0;
-        for (Map.Entry<String, List<PartitionMetadata>> en : kafkaPartitions.entrySet()) {
-          String clusterId = en.getKey();
-          for (PartitionMetadata pm : en.getValue()) {
-            if (kps[i % size] == null) {
-              kps[i % size] = new HashSet<KafkaPartition>();
+        if (isInitialParitition || newWaitingPartition.size() != 0) {
+          lastRepartitionTime = System.currentTimeMillis();
+          logger.info("[ONE_TO_MANY]: Initializing partition(s)");
+          // get partition metadata for topics.
+          // Whatever operator is using high-level or simple kafka consumer, the operator always create a temporary simple kafka consumer to get the metadata of the topic
+          // The initial value of brokerList of the KafkaConsumer is used to retrieve the topic metadata
+          Map<String, List<PartitionMetadata>> kafkaPartitions = KafkaMetadataUtil.getPartitionsForTopic(getConsumer().brokers, getConsumer().getTopic());
+
+          int size = initialPartitionCount;
+          @SuppressWarnings("unchecked")
+          Set<KafkaPartition>[] kps = (Set<KafkaPartition>[])Array.newInstance((new HashSet<KafkaPartition>()).getClass(), size);
+          int i = 0;
+          for (Map.Entry<String, List<PartitionMetadata>> en : kafkaPartitions.entrySet()) {
+            String clusterId = en.getKey();
+            for (PartitionMetadata pm : en.getValue()) {
+              if (kps[i % size] == null) {
+                kps[i % size] = new HashSet<KafkaPartition>();
+              }
+              kps[i % size].add(new KafkaPartition(clusterId, consumer.topic, pm.partitionId()));
+              i++;
             }
-            kps[i % size].add(new KafkaPartition(clusterId, consumer.topic, pm.partitionId()));
-            i++;
           }
+          size = i > size ? size : i;
+          newPartitions = new ArrayList<Partitioner.Partition<AbstractKafkaInputOperator<K>>>(size);
+          for (i = 0; i < size; i++) {
+            logger.info("[ONE_TO_MANY]: Create operator partition for kafka partition(s): {} ", StringUtils.join(kps[i], ", "));
+            newPartitions.add(createPartition(kps[i], initOffset));
+          }
+          // Add the existing partition Ids to the deleted operators
+          for (Partition<AbstractKafkaInputOperator<K>> op : partitions) {
+            deletedOperators.add(op.getPartitionedInstance().operatorId);
+          }
+          newWaitingPartition.clear();
+          resultPartitions = newPartitions;
+          numPartitionsChanged = true;
         }
-        size = i > size ? size : i;
-        newPartitions = new ArrayList<Partitioner.Partition<AbstractKafkaInputOperator<K>>>(size);
-        for (i = 0; i < size; i++) {
-          logger.info("[ONE_TO_MANY]: Create operator partition for kafka partition(s): {} ", StringUtils.join(kps[i], ", "));
-          newPartitions.add(createPartition(kps[i], initOffset));
-        }
-        // Add the existing partition Ids to the deleted operators
-        for (Partition<AbstractKafkaInputOperator<K>> op : partitions)
-        {
-          deletedOperators.add(op.getPartitionedInstance().operatorId);
-        }
-
-        newWaitingPartition.clear();
-        resultPartitions = newPartitions;
-        numPartitionsChanged = true;
-      }
-      break;
+        break;
 
-    case ONE_TO_MANY_HEURISTIC:
-      throw new UnsupportedOperationException("[ONE_TO_MANY_HEURISTIC]: Not implemented yet");
-    default:
-      break;
+      case ONE_TO_MANY_HEURISTIC:
+        throw new UnsupportedOperationException("[ONE_TO_MANY_HEURISTIC]: Not implemented yet");
+      default:
+        break;
     }
 
     if (numPartitionsChanged) {
@@ -689,7 +688,7 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
     List<KafkaConsumer.KafkaMeterStats> kmsList = new LinkedList<KafkaConsumer.KafkaMeterStats>();
     for (Stats.OperatorStats os : stats.getLastWindowedStats()) {
       if (os != null && os.counters instanceof KafkaConsumer.KafkaMeterStats) {
-        kmsList.add((KafkaConsumer.KafkaMeterStats) os.counters);
+        kmsList.add((KafkaConsumer.KafkaMeterStats)os.counters);
       }
     }
     return kmsList;
@@ -719,12 +718,12 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
       return false;
     }
 
-    if(repartitionInterval < 0){
+    if (repartitionInterval < 0) {
       // if repartition is disabled
       return false;
     }
 
-    if(t - lastRepartitionTime < repartitionInterval) {
+    if (t - lastRepartitionTime < repartitionInterval) {
       // return false if it's still within repartitionInterval since last (re)partition
       return false;
     }
@@ -747,18 +746,18 @@ public abstract class AbstractKafkaInputOperator<K extends KafkaConsumer> implem
         }
 
         Map<String, List<PartitionMetadata>> partitionsMeta = KafkaMetadataUtil.getPartitionsForTopic(consumer.brokers, consumer.getTopic());
-        if(partitionsMeta == null){
+        if (partitionsMeta == null) {
           //broker(s) has temporary issue to get metadata
           return false;
         }
         for (Map.Entry<String, List<PartitionMetadata>> en : partitionsMeta.entrySet()) {
-          if(en.getValue() == null){
+          if (en.getValue() == null) {
             //broker(s) has temporary issue to get metadata
             continue;
           }
           for (PartitionMetadata pm : en.getValue()) {
             KafkaPartition pa = new KafkaPartition(en.getKey(), consumer.topic, pm.partitionId());
-            if(!existingIds.contains(pa)){
+            if (!existingIds.contains(pa)) {
               newWaitingPartition.add(pa);
             }
           }
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaOutputOperator.java
index f0835c4..624c955 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaOutputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaOutputOperator.java
@@ -16,18 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.kafka;
+package org.apache.apex.malhar.contrib.kafka;
+
+import java.util.Properties;
+import javax.validation.constraints.NotNull;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.commons.lang3.StringUtils;
 
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.Operator;
 import kafka.javaapi.producer.Producer;
 import kafka.producer.ProducerConfig;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.validation.constraints.NotNull;
-import java.util.Properties;
 
 /**
  * This is the base implementation of a Kafka output operator, which writes data to the Kafka message bus.
@@ -86,7 +87,8 @@ public abstract class AbstractKafkaOutputOperator<K, V> implements Operator
    * setup producer configuration.
    * @return ProducerConfig
    */
-  protected ProducerConfig createKafkaProducerConfig(){
+  protected ProducerConfig createKafkaProducerConfig()
+  {
     Properties prop = new Properties();
     for (String propString : producerProperties.split(",")) {
       if (!propString.contains("=")) {
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaSinglePortInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
index 96dd599..f656807 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.kafka;
+package org.apache.apex.malhar.contrib.kafka;
 
 import com.datatorrent.api.DefaultOutputPort;
 
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/HighlevelKafkaConsumer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/HighlevelKafkaConsumer.java
index 85cee56..5531285 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/HighlevelKafkaConsumer.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/HighlevelKafkaConsumer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.kafka;
+package org.apache.apex.malhar.contrib.kafka;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,8 +30,6 @@ import java.util.concurrent.Executors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Joiner;
-
 import kafka.consumer.ConsumerConfig;
 import kafka.consumer.ConsumerIterator;
 import kafka.consumer.KafkaStream;
@@ -158,8 +156,8 @@ public class HighlevelKafkaConsumer extends KafkaConsumer
       Map<String, List<KafkaStream<byte[], byte[]>>> consumerMap = standardConsumer.get(e.getKey()).createMessageStreams(topicCountMap);
 
       for (final KafkaStream<byte[], byte[]> stream : consumerMap.get(topic)) {
-        consumerThreadExecutor.submit(new Runnable() {
-
+        consumerThreadExecutor.submit(new Runnable()
+        {
           KafkaPartition kp = new KafkaPartition(e.getKey(), topic, -1);
 
           public void run()
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaConsumer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaConsumer.java
index a67ff48..f59f2c8 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaConsumer.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaConsumer.java
@@ -16,21 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.datatorrent.contrib.kafka;
+package org.apache.apex.malhar.contrib.kafka;
 
-import com.datatorrent.api.Context;
-import com.esotericsoftware.kryo.serializers.FieldSerializer.Bind;
-import com.esotericsoftware.kryo.serializers.JavaSerializer;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Maps;
-import com.google.common.collect.SetMultimap;
-import kafka.message.Message;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Pattern.Flag;
 import java.io.Closeable;
 import java.io.Serializable;
 import java.util.Collection;
@@ -44,6 +31,19 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Pattern.Flag;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import com.esotericsoftware.kryo.serializers.FieldSerializer.Bind;
+import com.esotericsoftware.kryo.serializers.JavaSerializer;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.SetMultimap;
+import com.datatorrent.api.Context;
+import kafka.message.Message;
 
 /**
  * Base Kafka Consumer class used by kafka input operator
@@ -52,9 +52,9 @@ import java.util.concurrent.TimeUnit;
  */
 public abstract class KafkaConsumer implements Closeable
 {
-  protected final static String HIGHLEVEL_CONSUMER_ID_SUFFIX = "_stream_";
+  protected static final String HIGHLEVEL_CONSUMER_ID_SUFFIX = "_stream_";
 
-  protected final static String SIMPLE_CONSUMER_ID_SUFFIX = "_partition_";
+  protected static final String SIMPLE_CONSUMER_ID_SUFFIX = "_partition_";
   private String zookeeper;
 
   public KafkaConsumer()
@@ -111,7 +111,7 @@ public abstract class KafkaConsumer implements Closeable
    * This setting is case_insensitive
    * By default it always consume from the beginning of the queue
    */
-  @Pattern(flags={Flag.CASE_INSENSITIVE}, regexp = "earliest|latest")
+  @Pattern(flags = {Flag.CASE_INSENSITIVE}, regexp = "earliest|latest")
   protected String initialOffset = "latest";
 
 
@@ -122,17 +122,18 @@ public abstract class KafkaConsumer implements Closeable
   /**
    * This method is called in setup method of the operator
    */
-  public void create(){
+  public void create()
+  {
     initBrokers();
     holdingBuffer = new ArrayBlockingQueue<KafkaMessage>(cacheSize);
   }
 
   public void initBrokers()
   {
-    if(brokers!=null){
-      return ;
+    if (brokers != null) {
+      return;
     }
-    if(zookeeperMap !=null){
+    if (zookeeperMap != null) {
       brokers = HashMultimap.create();
       for (String clusterId: zookeeperMap.keySet()) {
         try {
@@ -158,12 +159,13 @@ public abstract class KafkaConsumer implements Closeable
   /**
    * The method is called in the deactivate method of the operator
    */
-  public void stop() {
+  public void stop()
+  {
     isAlive = false;
     statsSnapShot.stop();
     holdingBuffer.clear();
     IOUtils.closeQuietly(this);
-  };
+  }
 
   /**
    * This method is called in teardown method of the operator
@@ -227,7 +229,8 @@ public abstract class KafkaConsumer implements Closeable
   }
 
 
-  final protected void putMessage(KafkaPartition partition, Message msg, long offset) throws InterruptedException{
+  protected final void putMessage(KafkaPartition partition, Message msg, long offset) throws InterruptedException
+  {
     // block from receiving more message
     holdingBuffer.put(new KafkaMessage(partition, msg, offset));
     statsSnapShot.mark(partition, msg.payloadSize());
@@ -300,7 +303,8 @@ public abstract class KafkaConsumer implements Closeable
       totalBytesPerSec = _1minAvg[1];
     }
 
-    public void updateOffsets(Map<KafkaPartition, Long> offsets){
+    public void updateOffsets(Map<KafkaPartition, Long> offsets)
+    {
       for (Entry<KafkaPartition, Long> os : offsets.entrySet()) {
         PartitionStats ps = putPartitionStatsIfNotPresent(os.getKey());
         ps.offset = os.getValue();
@@ -325,7 +329,8 @@ public abstract class KafkaConsumer implements Closeable
       ps.brokerId = brokerId;
     }
 
-    private synchronized PartitionStats putPartitionStatsIfNotPresent(KafkaPartition kp){
+    private synchronized PartitionStats putPartitionStatsIfNotPresent(KafkaPartition kp)
+    {
       PartitionStats ps = partitionStats.get(kp);
 
       if (ps == null) {
@@ -347,6 +352,7 @@ public abstract class KafkaConsumer implements Closeable
       this.msg = msg;
       this.offSet = offset;
     }
+
     public KafkaPartition getKafkaPart()
     {
       return kafkaPart;
@@ -363,8 +369,8 @@ public abstract class KafkaConsumer implements Closeable
     }
   }
 
-  public static class KafkaMeterStatsUtil {
-
+  public static class KafkaMeterStatsUtil
+  {
     public static Map<KafkaPartition, Long> getOffsetsForPartitions(List<KafkaMeterStats> kafkaMeterStats)
     {
       Map<KafkaPartition, Long> result = Maps.newHashMap();
@@ -387,11 +393,8 @@ public abstract class KafkaConsumer implements Closeable
 
   }
 
-  public static class KafkaMeterStatsAggregator implements Context.CountersAggregator, Serializable{
-
-    /**
-     *
-     */
+  public static class KafkaMeterStatsAggregator implements Context.CountersAggregator, Serializable
+  {
     private static final long serialVersionUID = 729987800215151678L;
 
     @Override
@@ -399,7 +402,7 @@ public abstract class KafkaConsumer implements Closeable
     {
       KafkaMeterStats kms = new KafkaMeterStats();
       for (Object o : countersList) {
-        if (o instanceof KafkaMeterStats){
+        if (o instanceof KafkaMeterStats) {
           KafkaMeterStats subKMS = (KafkaMeterStats)o;
           kms.partitionStats.putAll(subKMS.partitionStats);
           kms.totalBytesPerSec += subKMS.totalBytesPerSec;
@@ -411,12 +414,8 @@ public abstract class KafkaConsumer implements Closeable
 
   }
 
-  public static class PartitionStats implements Serializable {
-
-
-    /**
-     *
-     */
+  public static class PartitionStats implements Serializable
+  {
     private static final long serialVersionUID = -6572690643487689766L;
 
     public int brokerId = -1;
@@ -431,13 +430,11 @@ public abstract class KafkaConsumer implements Closeable
 
   }
 
-
-
   /**
    * A snapshot of consuming rate within 1 min
    */
-  static class SnapShot {
-
+  static class SnapShot
+  {
     // msgs/s and bytes/s for each partition
 
     /**
@@ -485,35 +482,41 @@ public abstract class KafkaConsumer implements Closeable
     }
 
 
-    public void start(){
-      if(service==null){
+    public void start()
+    {
+      if (service == null) {
         service = Executors.newScheduledThreadPool(1);
       }
-      service.scheduleAtFixedRate(new Runnable() {
+      service.scheduleAtFixedRate(new Runnable()
+      {
         @Override
         public void run()
         {
           moveNext();
-          if(last<60)last++;
+          if (last < 60) {
+            last++;
+          }
         }
       }, 1, 1, TimeUnit.SECONDS);
 
     }
 
-    public void stop(){
-      if(service!=null){
+    public void stop()
+    {
+      if (service != null) {
         service.shutdown();
       }
     }
 
-    public synchronized void mark(KafkaPartition partition, long bytes){
+    public synchronized void mark(KafkaPartition partition, long bytes)
+    {
       msgSec[cursor]++;
       msgSec[60]++;
       bytesSec[cursor] += bytes;
       bytesSec[60] += bytes;
... 37109 lines suppressed ...

-- 
To stop receiving notification emails like this one, please contact
"commits@apex.apache.org" <co...@apex.apache.org>.

[apex-malhar] 01/02: relocate library, contrib, benchmark, hive packages - rename files

Posted by vr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

vrozov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apex-malhar.git

commit 192d65a2ecd46f32fb787008baeff74c633a37bf
Author: Apex Dev <de...@apex.apache.org>
AuthorDate: Mon Aug 14 06:38:39 2017 -0700

    relocate library, contrib, benchmark, hive packages - rename files
---
 .../apache/apex}/benchmark/ApplicationFixed.java     |  0
 .../apache/apex}/benchmark/Benchmark.java            |  0
 .../apache/apex}/benchmark/CouchBaseAppInput.java    |  0
 .../apache/apex}/benchmark/CouchBaseAppOutput.java   |  0
 .../apex}/benchmark/CouchBaseInputOperator.java      |  0
 .../apex}/benchmark/CouchBaseOutputOperator.java     |  0
 .../apex}/benchmark/FixedTuplesInputOperator.java    |  0
 .../apache/apex}/benchmark/RandomMapOutput.java      |  0
 .../apex}/benchmark/RandomWordInputModule.java       |  0
 .../apache/apex}/benchmark/WordCountOperator.java    |  0
 .../AerospikeOutputBenchmarkApplication.java         |  0
 .../benchmark/aerospike/AerospikeOutputOperator.java |  0
 .../algo/UniqueValueCountBenchmarkApplication.java   |  0
 .../CassandraOutputBenchmarkApplication.java         |  0
 .../benchmark/cassandra/CassandraOutputOperator.java |  0
 .../apex}/benchmark/fs/FSByteOutputOperator.java     |  0
 .../benchmark/fs/FSOutputOperatorBenchmark.java      |  0
 .../benchmark/hive/HiveInsertBenchmarkingApp.java    |  0
 .../benchmark/hive/HiveMapInsertBenchmarkingApp.java |  0
 .../benchmark/kafka/BenchmarkKafkaInputOperator.java |  0
 .../BenchmarkPartitionableKafkaOutputOperator.java   |  0
 .../apex}/benchmark/kafka/KafkaInputBenchmark.java   |  0
 .../apex}/benchmark/kafka/KafkaOutputBenchmark.java  |  0
 .../apex}/benchmark/kafka/KafkaTestPartitioner.java  |  0
 .../apache/apex}/benchmark/package-info.java         |  0
 .../script/RubyOperatorBenchmarkApplication.java     |  0
 .../benchmark/spillable/SpillableBenchmarkApp.java   |  0
 .../spillable/SpillableTestInputOperator.java        |  0
 .../benchmark/spillable/SpillableTestOperator.java   |  0
 .../benchmark/state/ManagedStateBenchmarkApp.java    |  0
 .../apache/apex}/benchmark/state/StoreOperator.java  |  0
 .../benchmark/stream/DevNullCounterBenchmark.java    |  0
 .../apex}/benchmark/stream/IntegerOperator.java      |  0
 .../apex}/benchmark/stream/StreamDuplicaterApp.java  |  0
 .../apex}/benchmark/stream/StreamMergeApp.java       |  0
 .../benchmark/testbench/EventClassifierApp.java      |  0
 .../EventClassifierNumberToHashDoubleApp.java        |  0
 .../apex}/benchmark/testbench/EventGeneratorApp.java |  0
 .../benchmark/testbench/EventIncrementerApp.java     |  0
 .../benchmark/testbench/FilterClassifierApp.java     |  0
 .../testbench/FilteredEventClassifierApp.java        |  0
 .../apex}/benchmark/testbench/HashMapOperator.java   |  0
 .../benchmark/testbench/RandomEventGeneratorApp.java |  0
 .../benchmark/testbench/SeedEventGeneratorApp.java   |  0
 .../benchmark/testbench/ThroughputCounterApp.java    |  0
 .../apex}/benchmark/window/AbstractGenerator.java    |  0
 .../window/AbstractWindowedOperatorBenchmarkApp.java |  0
 .../window/KeyedWindowedOperatorBenchmarkApp.java    |  0
 .../apache/apex}/benchmark/window/README.md          |  0
 .../window/WindowedOperatorBenchmarkApp.java         |  0
 .../apache/apex}/benchmark/ApplicationFixedTest.java |  0
 .../apache/apex}/benchmark/BenchmarkTest.java        |  0
 .../apex}/benchmark/CouchBaseBenchmarkTest.java      |  0
 .../apache/apex}/benchmark/accumulo/AccumuloApp.java |  0
 .../apex}/benchmark/accumulo/AccumuloAppTest.java    |  0
 .../aerospike/AerospikeBenchmarkAppTest.java         |  0
 .../algo/UniqueValueCountBenchmarkTest.java          |  0
 .../benchmark/cassandra/CassandraApplicatonTest.java |  0
 .../apex}/benchmark/hbase/HBaseApplicationTest.java  |  0
 .../benchmark/hbase/HBaseCsvMappingApplication.java  |  0
 .../benchmark/hive/HiveInsertBenchmarkTest.java      |  0
 .../apex}/benchmark/hive/HiveMapBenchmarkTest.java   |  0
 .../benchmark/kafka/KafkaInputBenchmarkTest.java     |  0
 .../benchmark/kafka/KafkaOutputBenchmarkTest.java    |  0
 .../apex}/benchmark/memsql/MemsqlInputBenchmark.java |  0
 .../benchmark/memsql/MemsqlInputBenchmarkTest.java   |  0
 .../benchmark/memsql/MemsqlOutputBenchmark.java      |  0
 .../benchmark/memsql/MemsqlOutputBenchmarkTest.java  |  0
 .../script/RubyOperatorBenchmarkAppTest.java         |  0
 .../spillable/SpillableBenchmarkAppTester.java       |  0
 .../spillable/SpillableDSBenchmarkTest.java          |  0
 .../state/ManagedStateBenchmarkAppTest.java          |  0
 .../benchmark/testbench/EventClassifierAppTest.java  |  0
 .../EventClassifierNumberToHashDoubleAppTest.java    |  0
 .../benchmark/testbench/EventGeneratorAppTest.java   |  0
 .../benchmark/testbench/EventIncrementerAppTest.java |  0
 .../benchmark/testbench/FilterClassifierAppTest.java |  0
 .../testbench/FilteredEventClassifierAppTest.java    |  0
 .../testbench/ThroughputCounterAppTest.java          |  0
 .../util/serde/GenericSerdePerformanceTest.java      |  0
 .../KeyedWindowedOperatorBenchmarkAppTest.java       |  0
 .../window/WindowedOperatorBenchmarkAppTest.java     |  0
 .../com/datatorrent/contrib/parser/package-info.java | 20 --------------------
 .../accumulo/AbstractAccumuloInputOperator.java      |  0
 .../accumulo/AbstractAccumuloOutputOperator.java     |  0
 .../apex/malhar}/contrib/accumulo/AccumuloStore.java |  0
 .../contrib/accumulo/AccumuloWindowStore.java        |  0
 .../apex/malhar}/contrib/accumulo/package-info.java  |  0
 .../aerospike/AbstractAerospikeGetOperator.java      |  0
 ...AbstractAerospikeNonTransactionalPutOperator.java |  0
 .../AbstractAerospikeTransactionalPutOperator.java   |  0
 .../AerospikePOJONonTransactionalPutOperator.java    |  0
 .../AerospikePOJOTransactionalPutOperator.java       |  0
 .../malhar}/contrib/aerospike/AerospikeStore.java    |  0
 .../aerospike/AerospikeTransactionalStore.java       |  0
 .../apex/malhar}/contrib/aerospike/package-info.java |  0
 .../contrib/apachelog/ApacheLogInputGenerator.java   |  0
 .../contrib/apachelog/ApplicationLocalLog.java       |  0
 .../contrib/apachelog/ApplicationLogGenerator.java   |  0
 .../malhar}/contrib/apachelog/GeoIPExtractor.java    |  0
 .../contrib/apachelog/TimestampExtractor.java        |  0
 .../contrib/apachelog/UserAgentExtractor.java        |  0
 .../apex/malhar}/contrib/apachelog/package-info.java |  0
 .../malhar}/contrib/apachelog/zmq/Application.java   |  0
 .../malhar}/contrib/avro/AvroFileInputOperator.java  |  0
 .../apex/malhar}/contrib/avro/AvroRecordHelper.java  |  0
 .../apache/apex/malhar}/contrib/avro/AvroToPojo.java |  0
 .../apache/apex/malhar}/contrib/avro/PojoToAvro.java |  0
 .../cassandra/AbstractCassandraInputOperator.java    |  0
 ...stractCassandraTransactionableOutputOperator.java |  0
 .../cassandra/AbstractUpsertOutputOperator.java      |  0
 .../cassandra/CassandraPOJOInputOperator.java        |  0
 .../cassandra/CassandraPOJOOutputOperator.java       |  0
 .../contrib/cassandra/CassandraPojoUtils.java        |  0
 .../CassandraPreparedStatementGenerator.java         |  0
 .../malhar}/contrib/cassandra/CassandraStore.java    |  0
 .../cassandra/CassandraTransactionalStore.java       |  0
 .../contrib/cassandra/ConnectionStateManager.java    |  0
 .../contrib/cassandra/UpsertExecutionContext.java    |  0
 .../apex/malhar}/contrib/cassandra/package-info.java |  0
 .../couchbase/AbstractCouchBaseInputOperator.java    |  0
 .../couchbase/AbstractCouchBaseOutputOperator.java   |  0
 .../couchbase/AbstractCouchBaseSetOperator.java      |  0
 .../contrib/couchbase/CouchBaseJSONSerializer.java   |  0
 .../couchbase/CouchBasePOJOInputOperator.java        |  0
 .../contrib/couchbase/CouchBaseSerializer.java       |  0
 .../malhar}/contrib/couchbase/CouchBaseStore.java    |  0
 .../contrib/couchbase/CouchBaseWindowStore.java      |  0
 .../contrib/couchbase/CouchbasePOJOSetOperator.java  |  0
 .../apex/malhar}/contrib/couchbase/package-info.java |  0
 .../couchdb/AbstractCouchDBInputOperator.java        |  0
 .../couchdb/AbstractCouchDBOutputOperator.java       |  0
 .../couchdb/AbstractMapBasedInputOperator.java       |  0
 .../contrib/couchdb/CouchDBPOJOInputOperator.java    |  0
 .../contrib/couchdb/CouchDBPOJOOutputOperator.java   |  0
 .../apex/malhar}/contrib/couchdb/CouchDbStore.java   |  0
 .../couchdb/MapBasedCouchDbOutputOperator.java       |  0
 .../apex/malhar}/contrib/couchdb/package-info.java   |  0
 .../AbstractElasticSearchInputOperator.java          |  0
 .../AbstractElasticSearchOutputOperator.java         |  0
 .../elasticsearch/ElasticSearchConnectable.java      |  0
 .../elasticsearch/ElasticSearchMapInputOperator.java |  0
 .../ElasticSearchMapOutputOperator.java              |  0
 .../ElasticSearchPercolatorOperator.java             |  0
 .../elasticsearch/ElasticSearchPercolatorStore.java  |  0
 .../malhar}/contrib/elasticsearch/package-info.java  |  0
 .../malhar}/contrib/enrich/AbstractEnricher.java     |  0
 .../apex/malhar}/contrib/enrich/BackendLoader.java   |  0
 .../malhar}/contrib/enrich/DelimitedFSLoader.java    |  0
 .../apache/apex/malhar}/contrib/enrich/FSLoader.java |  0
 .../malhar}/contrib/enrich/FixedWidthFSLoader.java   |  0
 .../apex/malhar}/contrib/enrich/JDBCLoader.java      |  0
 .../apex/malhar}/contrib/enrich/JsonFSLoader.java    |  0
 .../apex/malhar}/contrib/enrich/MapEnricher.java     |  0
 .../contrib/enrich/NullValuesCacheManager.java       |  0
 .../apex/malhar}/contrib/enrich/POJOEnricher.java    |  0
 .../apex/malhar}/contrib/enrich/ReadOnlyBackup.java  |  0
 .../apex/malhar}/contrib/formatter/CsvFormatter.java |  0
 .../contrib/geode/AbstractGeodeInputOperator.java    |  0
 .../contrib/geode/AbstractGeodeOutputOperator.java   |  0
 .../malhar}/contrib/geode/GeodeCheckpointStore.java  |  0
 .../contrib/geode/GeodeKeyValueStorageAgent.java     |  0
 .../contrib/geode/GeodePOJOOutputOperator.java       |  0
 .../apex/malhar}/contrib/geode/GeodeStore.java       |  0
 .../malhar}/contrib/geode/RegionCreateFunction.java  |  0
 .../hbase/AbstractHBaseAppendOutputOperator.java     |  0
 .../hbase/AbstractHBasePutOutputOperator.java        |  0
 .../AbstractHBaseWindowAppendOutputOperator.java     |  0
 .../hbase/AbstractHBaseWindowPutOutputOperator.java  |  0
 .../contrib/hbase/HBaseCsvMappingPutOperator.java    |  0
 .../apex/malhar}/contrib/hbase/HBaseFieldInfo.java   |  0
 .../contrib/hbase/HBaseFieldValueGenerator.java      |  0
 .../apex/malhar}/contrib/hbase/HBaseGetOperator.java |  0
 .../malhar}/contrib/hbase/HBaseInputOperator.java    |  0
 .../contrib/hbase/HBaseNameValueCsvPutOperator.java  |  0
 .../malhar}/contrib/hbase/HBaseOperatorBase.java     |  0
 .../contrib/hbase/HBasePOJOInputOperator.java        |  0
 .../malhar}/contrib/hbase/HBasePOJOPutOperator.java  |  0
 .../malhar}/contrib/hbase/HBaseScanOperator.java     |  0
 .../apex/malhar}/contrib/hbase/HBaseStore.java       |  0
 .../apex/malhar}/contrib/hbase/HBaseWindowStore.java |  0
 .../apex/malhar}/contrib/hbase/package-info.java     |  0
 .../apex/malhar}/contrib/jython/PythonOperator.java  |  0
 .../apex/malhar}/contrib/jython/package-info.java    |  0
 .../AbstractExactlyOnceKafkaOutputOperator.java      |  0
 .../contrib/kafka/AbstractKafkaInputOperator.java    |  0
 .../contrib/kafka/AbstractKafkaOutputOperator.java   |  0
 .../kafka/AbstractKafkaSinglePortInputOperator.java  |  0
 .../contrib/kafka/HighlevelKafkaConsumer.java        |  0
 .../apex/malhar}/contrib/kafka/KafkaConsumer.java    |  0
 .../apex/malhar}/contrib/kafka/KafkaJsonEncoder.java |  0
 .../malhar}/contrib/kafka/KafkaMetadataUtil.java     |  0
 .../apex/malhar}/contrib/kafka/KafkaPartition.java   |  0
 .../kafka/KafkaSinglePortByteArrayInputOperator.java |  0
 .../contrib/kafka/KafkaSinglePortOutputOperator.java |  0
 .../kafka/KafkaSinglePortStringInputOperator.java    |  0
 .../apex/malhar}/contrib/kafka/OffsetManager.java    |  0
 .../contrib/kafka/POJOKafkaOutputOperator.java       |  0
 .../malhar}/contrib/kafka/SimpleKafkaConsumer.java   |  0
 .../apex/malhar}/contrib/kafka/package-info.java     |  0
 .../kinesis/AbstractKinesisInputOperator.java        |  0
 .../kinesis/AbstractKinesisOutputOperator.java       |  0
 .../kinesis/KinesisByteArrayInputOperator.java       |  0
 .../kinesis/KinesisByteArrayOutputOperator.java      |  0
 .../malhar}/contrib/kinesis/KinesisConsumer.java     |  0
 .../contrib/kinesis/KinesisStringInputOperator.java  |  0
 .../contrib/kinesis/KinesisStringOutputOperator.java |  0
 .../apex/malhar}/contrib/kinesis/KinesisUtil.java    |  0
 .../apex/malhar}/contrib/kinesis/ShardManager.java   |  0
 .../apex/malhar}/contrib/kinesis/package-info.java   |  0
 .../memcache/AbstractMemcacheInputOperator.java      |  0
 .../memcache/AbstractMemcacheOutputOperator.java     |  0
 .../contrib/memcache/MemcachePOJOOutputOperator.java |  0
 .../apex/malhar}/contrib/memcache/MemcacheStore.java |  0
 .../apex/malhar}/contrib/memcache/package-info.java  |  0
 .../AbstractMemcacheInputOperator.java               |  0
 .../AbstractMemcacheOutputOperator.java              |  0
 .../contrib/memcache_whalin/MemcacheStore.java       |  0
 .../contrib/memcache_whalin/package-info.java        |  0
 .../contrib/memsql/AbstractMemsqlInputOperator.java  |  0
 .../contrib/memsql/AbstractMemsqlOutputOperator.java |  0
 .../contrib/memsql/MemsqlPOJOInputOperator.java      |  0
 .../contrib/memsql/MemsqlPOJOOutputOperator.java     |  0
 .../apex/malhar}/contrib/memsql/MemsqlStore.java     |  0
 .../apex/malhar}/contrib/memsql/package-info.java    |  0
 .../mongodb/MongoDBArrayListOutputOperator.java      |  0
 .../malhar}/contrib/mongodb/MongoDBConnectable.java  |  0
 .../mongodb/MongoDBHashMapOutputOperator.java        |  0
 .../contrib/mongodb/MongoDBInputOperator.java        |  0
 .../contrib/mongodb/MongoDBOutputOperator.java       |  0
 .../contrib/mongodb/MongoDBPOJOOutputOperator.java   |  0
 .../apex/malhar}/contrib/mongodb/package-info.java   |  0
 .../contrib/mqtt/AbstractMqttInputOperator.java      |  0
 .../contrib/mqtt/AbstractMqttOutputOperator.java     |  0
 .../mqtt/AbstractSinglePortMqttInputOperator.java    |  0
 .../mqtt/AbstractSinglePortMqttOutputOperator.java   |  0
 .../apex/malhar}/contrib/mqtt/MqttClientConfig.java  |  0
 .../apex/malhar}/contrib/mqtt/package-info.java      |  0
 .../contrib/nifi/AbstractNiFiInputOperator.java      |  0
 .../contrib/nifi/AbstractNiFiOutputOperator.java     |  0
 .../nifi/AbstractNiFiSinglePortInputOperator.java    |  0
 .../apex/malhar}/contrib/nifi/NiFiDataPacket.java    |  0
 .../malhar}/contrib/nifi/NiFiDataPacketBuilder.java  |  0
 .../contrib/nifi/NiFiSinglePortInputOperator.java    |  0
 .../contrib/nifi/NiFiSinglePortOutputOperator.java   |  0
 .../malhar}/contrib/nifi/StandardNiFiDataPacket.java |  0
 .../contrib/parquet/AbstractParquetFileReader.java   |  0
 .../contrib/parquet/ParquetFilePOJOReader.java       |  0
 .../malhar}/contrib/parser/AbstractCsvParser.java    |  0
 .../malhar}/contrib/parser/CellProcessorBuilder.java |  0
 .../apex/malhar}/contrib/parser/CsvParser.java       |  0
 .../apex/malhar}/contrib/parser/DelimitedSchema.java |  0
 .../malhar}/contrib/parser/FixedWidthParser.java     |  0
 .../malhar}/contrib/parser/FixedWidthSchema.java     |  0
 .../apex/malhar}/contrib/parser/JsonParser.java      |  0
 .../apex/malhar}/contrib/parser/RegexParser.java     |  0
 .../apache/apex/malhar}/contrib/parser/Schema.java   |  0
 .../apex/malhar/contrib/parser/package-info.java     |  2 +-
 .../apex/malhar}/contrib/r/REngineConnectable.java   |  0
 .../apache/apex/malhar}/contrib/r/RMax.java          |  0
 .../apache/apex/malhar}/contrib/r/RMin.java          |  0
 .../apache/apex/malhar}/contrib/r/RScript.java       |  0
 .../apex/malhar}/contrib/r/RStandardDeviation.java   |  0
 .../apache/apex/malhar}/contrib/r/package-info.java  |  0
 .../rabbitmq/AbstractRabbitMQInputOperator.java      |  0
 .../rabbitmq/AbstractRabbitMQOutputOperator.java     |  0
 .../AbstractSinglePortRabbitMQInputOperator.java     |  0
 .../AbstractSinglePortRabbitMQOutputOperator.java    |  0
 .../contrib/rabbitmq/RabbitMQInputOperator.java      |  0
 .../contrib/rabbitmq/RabbitMQOutputOperator.java     |  0
 .../apex/malhar}/contrib/rabbitmq/package-info.java  |  0
 .../redis/AbstractRedisAggregateOutputOperator.java  |  0
 .../contrib/redis/AbstractRedisInputOperator.java    |  0
 .../apex/malhar}/contrib/redis/LettuceStore.java     |  0
 .../apex/malhar}/contrib/redis/NumberSummation.java  |  0
 .../contrib/redis/RedisKeyValPairOutputOperator.java |  0
 .../contrib/redis/RedisKeyValueInputOperator.java    |  0
 .../contrib/redis/RedisMapAsValueInputOperator.java  |  0
 .../contrib/redis/RedisMapOutputOperator.java        |  0
 ...RedisNumberSummationKeyValPairOutputOperator.java |  0
 .../redis/RedisNumberSummationMapOutputOperator.java |  0
 .../contrib/redis/RedisPOJOInputOperator.java        |  0
 .../contrib/redis/RedisPOJOOutputOperator.java       |  0
 .../apex/malhar}/contrib/redis/RedisStore.java       |  0
 .../apex/malhar}/contrib/redis/package-info.java     |  0
 .../contrib/romesyndication/RomeFeedEntry.java       |  0
 .../contrib/romesyndication/RomeStreamProvider.java  |  0
 .../romesyndication/RomeSyndicationOperator.java     |  0
 .../contrib/romesyndication/package-info.java        |  0
 .../apex/malhar}/contrib/ruby/RubyOperator.java      |  0
 .../contrib/solr/AbstractSolrInputOperator.java      |  0
 .../contrib/solr/AbstractSolrOutputOperator.java     |  0
 .../contrib/solr/CloudSolrServerConnector.java       |  0
 .../solr/ConcurrentUpdateSolrServerConnector.java    |  0
 .../contrib/solr/HttpSolrServerConnector.java        |  0
 .../contrib/solr/LBHttpSolrServerConnector.java      |  0
 .../apache/apex/malhar}/contrib/solr/README.md       |  0
 .../apex/malhar}/contrib/solr/SolrInputOperator.java |  0
 .../malhar}/contrib/solr/SolrOutputOperator.java     |  0
 .../malhar}/contrib/solr/SolrServerConnector.java    |  0
 .../apex/malhar}/contrib/solr/package-info.java      |  0
 .../contrib/splunk/AbstractSplunkInputOperator.java  |  0
 .../contrib/splunk/SplunkInputFromForwarder.java     |  0
 .../malhar}/contrib/splunk/SplunkInputOperator.java  |  0
 .../apex/malhar}/contrib/splunk/SplunkStore.java     |  0
 .../contrib/splunk/SplunkTcpOutputOperator.java      |  0
 .../apex/malhar}/contrib/splunk/package-info.java    |  0
 .../malhar}/contrib/sqlite/SqliteStreamOperator.java |  0
 .../apex/malhar}/contrib/sqlite/package-info.java    |  0
 .../malhar}/contrib/twitter/TwitterSampleInput.java  |  0
 .../contrib/zmq/AbstractBaseZeroMQInputOperator.java |  0
 .../zmq/AbstractBaseZeroMQOutputOperator.java        |  0
 .../zmq/AbstractSinglePortZeroMQInputOperator.java   |  0
 .../zmq/AbstractSinglePortZeroMQOutputOperator.java  |  0
 .../zmq/SimpleSinglePortZeroMQPullInputOperator.java |  0
 ...impleSinglePortZeroMQPullStringInputOperator.java |  0
 .../malhar}/contrib/zmq/ZeroMQInputOperator.java     |  0
 .../malhar}/contrib/zmq/ZeroMQOutputOperator.java    |  0
 .../apex/malhar}/contrib/zmq/package-info.java       |  0
 .../apache/apex/malhar}/contrib/apachelog/agents.txt |  0
 .../apex/malhar}/contrib/apachelog/ipaddress.txt     |  0
 .../apex/malhar}/contrib/apachelog/referers.txt      |  0
 .../apache/apex/malhar}/contrib/apachelog/urls.txt   |  0
 .../contrib/accumulo/AccumuloInputOperatorTest.java  |  0
 .../contrib/accumulo/AccumuloOutputOperatorTest.java |  0
 .../contrib/accumulo/AccumuloRowTupleGenerator.java  |  0
 .../malhar}/contrib/accumulo/AccumuloTestHelper.java |  0
 .../apex/malhar}/contrib/accumulo/AccumuloTuple.java |  0
 .../contrib/accumulo/AccumuloTupleCollector.java     |  0
 .../contrib/aerospike/AerospikeOperatorTest.java     |  0
 ...AerospikePOJONonTransactionalPutOperatorTest.java |  0
 .../AerospikePOJOTransactionalPutOperatorTest.java   |  0
 .../contrib/aerospike/AerospikeTestUtils.java        |  0
 .../apachelog/ApacheLogInputGeneratorTest.java       |  0
 .../contrib/apachelog/ApplicationLocalLogTest.java   |  0
 .../apachelog/ApplicationLogGeneratorTest.java       |  0
 .../contrib/apachelog/zmq/ApplicationTest.java       |  0
 .../contrib/avro/AvroFileInputOperatorTest.java      |  0
 .../apex/malhar}/contrib/avro/AvroToPojoTest.java    |  0
 .../apex/malhar}/contrib/avro/PojoToAvroTest.java    |  0
 .../AbstractUpsertOutputOperatorCodecsTest.java      |  0
 .../AbstractUpsertOutputOperatorCompositePKTest.java |  0
 .../AbstractUpsertOutputOperatorCountersTest.java    |  0
 .../apex/malhar}/contrib/cassandra/Address.java      |  0
 .../apex/malhar}/contrib/cassandra/AddressCodec.java |  0
 .../CassandraLookupCacheBackedOperatorTest.java      |  0
 .../contrib/cassandra/CassandraOperatorTest.java     |  0
 .../contrib/cassandra/CompositePrimaryKeyRow.java    |  0
 .../cassandra/CompositePrimaryKeyUpdateOperator.java |  0
 .../contrib/cassandra/CounterColumnTableEntry.java   |  0
 .../cassandra/CounterColumnUpdatesOperator.java      |  0
 .../apex/malhar}/contrib/cassandra/FullName.java     |  0
 .../malhar}/contrib/cassandra/FullNameCodec.java     |  0
 .../malhar}/contrib/cassandra/TestInputPojo.java     |  0
 .../apache/apex/malhar}/contrib/cassandra/User.java  |  0
 .../contrib/cassandra/UserUpsertOperator.java        |  0
 .../malhar}/contrib/couchbase/CouchBaseGetTest.java  |  0
 .../couchbase/CouchBaseInputOperatorTest.java        |  0
 .../couchbase/CouchBaseOutputOperatorTest.java       |  0
 .../malhar}/contrib/couchbase/CouchBasePOJOTest.java |  0
 .../malhar}/contrib/couchbase/CouchBaseSetTest.java  |  0
 .../contrib/couchbase/TestComplexPojoInput.java      |  0
 .../apex/malhar}/contrib/couchbase/TestPojo.java     |  0
 .../contrib/couchdb/CouchDBInputOperatorTest.java    |  0
 .../contrib/couchdb/CouchDBOutputOperatorTest.java   |  0
 .../couchdb/CouchDBPOJOInputOperatorTest.java        |  0
 .../malhar}/contrib/couchdb/CouchDBTestHelper.java   |  0
 .../couchdb/PagedCouchDBInputOperatorTest.java       |  0
 .../apex/malhar}/contrib/couchdb/TestInputPOJO.java  |  0
 .../elasticsearch/ElasticSearchOperatorTest.java     |  0
 .../elasticsearch/ElasticSearchPercolateTest.java    |  0
 .../apex/malhar}/contrib/enrich/EmployeeOrder.java   |  0
 .../malhar}/contrib/enrich/FileEnrichmentTest.java   |  0
 .../apex/malhar}/contrib/enrich/JDBCLoaderTest.java  |  0
 .../apex/malhar}/contrib/enrich/MapEnricherTest.java |  0
 .../apache/apex/malhar}/contrib/enrich/Order.java    |  0
 .../malhar}/contrib/enrich/POJOEnricherTest.java     |  0
 .../malhar}/contrib/formatter/CsvFormatterTest.java  |  0
 .../contrib/geode/GeodeCheckpointStoreTest.java      |  0
 .../contrib/geode/GeodeKeyValueStorageAgentTest.java |  0
 .../malhar}/contrib/geode/GeodeOperatorTest.java     |  0
 .../malhar}/contrib/geode/GeodePOJOOperatorTest.java |  0
 .../apex/malhar}/contrib/geode/GeodeStoreTest.java   |  0
 .../contrib/hbase/HBaseColTupleGenerator.java        |  0
 .../hbase/HBaseCsvMappingPutOperatorTest.java        |  0
 .../malhar}/contrib/hbase/HBaseGetOperatorTest.java  |  0
 .../hbase/HBaseNameValueCsvPutOperatorTest.java      |  0
 .../contrib/hbase/HBasePOJOInputOperatorTest.java    |  0
 .../contrib/hbase/HBasePOJOPutOperatorTest.java      |  0
 .../contrib/hbase/HBaseRowStringGenerator.java       |  0
 .../contrib/hbase/HBaseRowTupleGenerator.java        |  0
 .../malhar}/contrib/hbase/HBaseScanOperatorTest.java |  0
 .../apex/malhar}/contrib/hbase/HBaseTestHelper.java  |  0
 .../hbase/HBaseTransactionalAppendOperatorTest.java  |  0
 .../hbase/HBaseTransactionalPutOperatorTest.java     |  0
 .../apex/malhar}/contrib/hbase/HBaseTuple.java       |  0
 .../malhar}/contrib/hbase/HBaseTupleCollector.java   |  0
 .../apache/apex/malhar}/contrib/hbase/HBaseUtil.java |  0
 .../apex/malhar}/contrib/helper/CollectorModule.java |  0
 .../contrib/helper/MessageQueueTestHelper.java       |  0
 .../apex/malhar}/contrib/helper/SourceModule.java    |  0
 .../malhar}/contrib/jython/PythonOperatorTest.java   |  0
 .../kafka/KafkaExactlyOnceOutputOperatorTest.java    |  0
 .../contrib/kafka/KafkaInputOperatorTest.java        |  0
 .../malhar}/contrib/kafka/KafkaOperatorTestBase.java |  0
 .../contrib/kafka/KafkaOutputOperatorTest.java       |  0
 .../kafka/KafkaPartitionableInputOperatorTest.java   |  0
 .../malhar}/contrib/kafka/KafkaSimpleConsumer.java   |  0
 .../malhar}/contrib/kafka/KafkaTestConsumer.java     |  0
 .../malhar}/contrib/kafka/KafkaTestPartitioner.java  |  0
 .../malhar}/contrib/kafka/KafkaTestProducer.java     |  0
 .../malhar}/contrib/kafka/OffsetManagerTest.java     |  0
 .../contrib/kafka/SimpleKakfaConsumerTest.java       |  0
 .../kinesis/KinesisByteArrayOutputOperatorTest.java  |  0
 .../contrib/kinesis/KinesisInputOperatorTest.java    |  0
 .../contrib/kinesis/KinesisOperatorTestBase.java     |  0
 .../contrib/kinesis/KinesisOutputOperatorTest.java   |  0
 .../KinesisPartitionableInputOperatorTest.java       |  0
 .../kinesis/KinesisStringOutputOperatorTest.java     |  0
 .../malhar}/contrib/kinesis/KinesisTestConsumer.java |  0
 .../malhar}/contrib/kinesis/KinesisTestProducer.java |  0
 .../malhar}/contrib/kinesis/ShardManagerTest.java    |  0
 .../contrib/memcache/MemcacheOperatorTest.java       |  0
 .../contrib/memcache/MemcachePOJOOperatorTest.java   |  0
 .../memcache_whalin/MemcacheWhalinOperatorTest.java  |  0
 .../memsql/AbstractMemsqlInputOperatorTest.java      |  0
 .../memsql/AbstractMemsqlOutputOperatorTest.java     |  0
 .../malhar}/contrib/memsql/MemsqlInputOperator.java  |  0
 .../apex/malhar}/contrib/memsql/MemsqlStoreTest.java |  0
 .../apex/malhar}/contrib/memsql/TestInputPojo.java   |  0
 .../contrib/mongodb/MongoDBInputOperatorTest.java    |  0
 .../contrib/mongodb/MongoDBOutputOperatorTest.java   |  0
 .../apex/malhar}/contrib/mongodb/TestPOJO.java       |  0
 .../malhar}/contrib/mqtt/MqttInputOperatorTest.java  |  0
 .../malhar}/contrib/mqtt/MqttOutputOperatorTest.java |  0
 .../nifi/NiFiSinglePortInputOperatorTest.java        |  0
 .../nifi/NiFiSinglePortOutputOperatorTest.java       |  0
 .../contrib/nifi/demo/TestNiFiInputApplication.java  |  0
 .../contrib/nifi/demo/TestNiFiOutputApplication.java |  0
 .../malhar}/contrib/nifi/mock/MockDataPacket.java    |  0
 .../contrib/nifi/mock/MockSiteToSiteClient.java      |  0
 .../malhar}/contrib/nifi/mock/MockTransaction.java   |  0
 .../contrib/parquet/ParquetFilePOJOReaderTest.java   |  0
 .../apex/malhar}/contrib/parser/CSVParserTest.java   |  0
 .../malhar}/contrib/parser/CsvPOJOParserTest.java    |  0
 .../apex/malhar}/contrib/parser/FixedWidthTest.java  |  0
 .../contrib/parser/JsonParserApplicationTest.java    |  0
 .../apex/malhar}/contrib/parser/JsonParserTest.java  |  0
 .../apex/malhar}/contrib/parser/RegexParserTest.java |  0
 .../apex/malhar}/contrib/r/RMaxOperatorTest.java     |  0
 .../apex/malhar}/contrib/r/RMinOperatorTest.java     |  0
 .../r/RScriptLinearRegressionPredictorTest.java      |  0
 .../contrib/r/RScriptOperatorBooleanTest.java        |  0
 .../contrib/r/RScriptOperatorDoubleArrayTest.java    |  0
 .../malhar}/contrib/r/RScriptOperatorIntTest.java    |  0
 .../malhar}/contrib/r/RScriptOperatorRealTest.java   |  0
 .../malhar}/contrib/r/RScriptOperatorStrTest.java    |  0
 .../contrib/r/RStandardDeviationOperatorTest.java    |  0
 .../rabbitmq/RabbitMQInputOperatorBenchmark.java     |  0
 .../contrib/rabbitmq/RabbitMQInputOperatorTest.java  |  0
 .../rabbitmq/RabbitMQOutputOperatorBenchmark.java    |  0
 .../contrib/rabbitmq/RabbitMQOutputOperatorTest.java |  0
 .../contrib/redis/RedisInputOperatorTest.java        |  0
 .../malhar}/contrib/redis/RedisOperatorTest.java     |  0
 .../malhar}/contrib/redis/RedisPOJOOperatorTest.java |  0
 .../romesyndication/RomeSyndicationOperatorTest.java |  0
 .../apex/malhar}/contrib/ruby/RubyOperatorTest.java  |  0
 .../contrib/splunk/SplunkInputFromForwarderTest.java |  0
 .../contrib/splunk/SplunkInputOperatorTest.java      |  0
 .../contrib/splunk/SplunkTcpOutputOperatorTest.java  |  0
 .../util/FieldValueSerializableGenerator.java        |  0
 .../contrib/util/POJOTupleGenerateOperator.java      |  0
 .../apache/apex/malhar}/contrib/util/TestPOJO.java   |  0
 .../contrib/util/TupleCacheOutputOperator.java       |  0
 .../contrib/util/TupleGenerateCacheOperator.java     |  0
 .../apex/malhar}/contrib/util/TupleGenerator.java    |  0
 .../contrib/zmq/ZeroMQInputOperatorBenchmark.java    |  0
 .../malhar}/contrib/zmq/ZeroMQInputOperatorTest.java |  0
 .../malhar}/contrib/zmq/ZeroMQMessageGenerator.java  |  0
 .../malhar}/contrib/zmq/ZeroMQMessageReceiver.java   |  0
 .../contrib/zmq/ZeroMQOutputOperatorBenchmark.java   |  0
 .../contrib/zmq/ZeroMQOutputOperatorTest.java        |  0
 .../hive/AbstractFSRollingOutputOperator.java        |  0
 .../apex/malhar}/hive/FSPojoToHiveOperator.java      |  0
 .../apache/apex/malhar}/hive/HiveOperator.java       |  0
 .../apache/apex/malhar}/hive/HiveStore.java          |  0
 .../apache/apex/malhar}/hive/HiveStreamCodec.java    |  0
 .../apache/apex/malhar}/hive/package-info.java       |  0
 .../apex/malhar}/hive/FSRollingMapTestImpl.java      |  0
 .../apache/apex/malhar}/hive/FSRollingTestImpl.java  |  0
 .../apache/apex/malhar}/hive/HiveMockTest.java       |  0
 .../apache/apex/malhar}/hive/HiveStoreTest.java      |  0
 .../apache/apex/malhar}/lib/algo/BottomNMap.java     |  0
 .../apache/apex/malhar}/lib/algo/BottomNUnifier.java |  0
 .../apex/malhar}/lib/algo/BottomNUniqueMap.java      |  0
 .../apex/malhar}/lib/algo/CompareExceptCountMap.java |  0
 .../apache/apex/malhar}/lib/algo/Distinct.java       |  0
 .../apache/apex/malhar}/lib/algo/FilterValues.java   |  0
 .../apache/apex/malhar}/lib/algo/InsertSort.java     |  0
 .../lib/algo/LeastFrequentKeyArrayUnifier.java       |  0
 .../malhar}/lib/algo/LeastFrequentKeyUnifier.java    |  0
 .../apex/malhar}/lib/algo/LeastFrequentValue.java    |  0
 .../apache/apex/malhar}/lib/algo/MatchAllMap.java    |  0
 .../apache/apex/malhar}/lib/algo/MatchAnyMap.java    |  0
 .../apache/apex/malhar}/lib/algo/MatchMap.java       |  0
 .../apache/apex/malhar}/lib/algo/MergeSort.java      |  0
 .../apex/malhar}/lib/algo/MergeSortNumber.java       |  0
 .../apex/malhar}/lib/algo/MostFrequentValue.java     |  0
 .../apache/apex/malhar}/lib/algo/TopN.java           |  0
 .../apache/apex/malhar}/lib/algo/TopNUnique.java     |  0
 .../apache/apex/malhar}/lib/algo/UniqueCounter.java  |  0
 .../apex/malhar}/lib/algo/UniqueValueCount.java      |  0
 .../apache/apex/malhar}/lib/algo/package-info.java   |  0
 .../apache/apex/malhar}/lib/appdata/QueueUtils.java  |  0
 .../apache/apex/malhar}/lib/appdata/StoreUtils.java  |  0
 .../datastructs/CacheLRUSynchronousFlush.java        |  0
 .../lib/appdata/datastructs/DimensionalTable.java    |  0
 .../appdata/datastructs/NOPCacheFlushListener.java   |  0
 .../malhar}/lib/appdata/gpo/GPOByteArrayList.java    |  0
 .../apex/malhar}/lib/appdata/gpo/GPOGetters.java     |  0
 .../apex/malhar}/lib/appdata/gpo/GPOMutable.java     |  0
 .../apache/apex/malhar}/lib/appdata/gpo/GPOType.java |  0
 .../apex/malhar}/lib/appdata/gpo/GPOUtils.java       |  0
 .../apache/apex/malhar}/lib/appdata/gpo/Serde.java   |  0
 .../lib/appdata/gpo/SerdeFieldsDescriptor.java       |  0
 .../malhar}/lib/appdata/gpo/SerdeListGPOMutable.java |  0
 .../malhar}/lib/appdata/gpo/SerdeListPrimitive.java  |  0
 .../malhar}/lib/appdata/gpo/SerdeListString.java     |  0
 .../malhar}/lib/appdata/gpo/SerdeMapPrimitive.java   |  0
 .../lib/appdata/gpo/SerdeObjectPayloadFix.java       |  0
 .../apex/malhar}/lib/appdata/package-info.java       |  0
 .../appdata/query/AbstractWindowEndQueueManager.java |  0
 .../appdata/query/AppDataWindowEndQueueManager.java  |  0
 .../apex/malhar}/lib/appdata/query/QueryBundle.java  |  0
 .../malhar}/lib/appdata/query/QueryExecutor.java     |  0
 .../lib/appdata/query/QueryManagerAsynchronous.java  |  0
 .../lib/appdata/query/QueryManagerSynchronous.java   |  0
 .../apex/malhar}/lib/appdata/query/QueueList.java    |  0
 .../apex/malhar}/lib/appdata/query/QueueManager.java |  0
 .../lib/appdata/query/SimpleDoneQueueManager.java    |  0
 .../lib/appdata/query/SimpleQueueManager.java        |  0
 .../lib/appdata/query/WindowBoundedService.java      |  0
 .../lib/appdata/query/WindowEndQueueManager.java     |  0
 .../query/serde/CustomMessageDeserializer.java       |  0
 .../appdata/query/serde/CustomMessageSerializer.java |  0
 .../appdata/query/serde/CustomMessageValidator.java  |  0
 .../query/serde/DataQuerySnapshotDeserializer.java   |  0
 .../query/serde/DataQuerySnapshotValidator.java      |  0
 .../query/serde/DataResultSnapshotSerializer.java    |  0
 .../query/serde/MessageDeserializerFactory.java      |  0
 .../appdata/query/serde/MessageDeserializerInfo.java |  0
 .../query/serde/MessageSerializerFactory.java        |  0
 .../appdata/query/serde/MessageSerializerInfo.java   |  0
 .../malhar}/lib/appdata/query/serde/MessageType.java |  0
 .../appdata/query/serde/MessageValidatorInfo.java    |  0
 .../appdata/query/serde/SchemaQueryDeserializer.java |  0
 .../appdata/query/serde/SimpleDataDeserializer.java  |  0
 .../appdata/query/serde/SimpleDataSerializer.java    |  0
 .../lib/appdata/query/serde/SimpleDataValidator.java |  0
 .../lib/appdata/schemas/CustomTimeBucket.java        |  0
 .../lib/appdata/schemas/DataQuerySnapshot.java       |  0
 .../lib/appdata/schemas/DataResultSnapshot.java      |  0
 .../schemas/DimensionalConfigurationSchema.java      |  0
 .../lib/appdata/schemas/DimensionalSchema.java       |  0
 .../apex/malhar}/lib/appdata/schemas/Fields.java     |  0
 .../lib/appdata/schemas/FieldsDescriptor.java        |  0
 .../apex/malhar}/lib/appdata/schemas/JSONType.java   |  0
 .../apex/malhar}/lib/appdata/schemas/Message.java    |  0
 .../apex/malhar}/lib/appdata/schemas/QRBase.java     |  0
 .../apex/malhar}/lib/appdata/schemas/Query.java      |  0
 .../apex/malhar}/lib/appdata/schemas/Result.java     |  0
 .../malhar}/lib/appdata/schemas/ResultFormatter.java |  0
 .../apex/malhar}/lib/appdata/schemas/Schema.java     |  0
 .../malhar}/lib/appdata/schemas/SchemaQuery.java     |  0
 .../malhar}/lib/appdata/schemas/SchemaRegistry.java  |  0
 .../lib/appdata/schemas/SchemaRegistryMultiple.java  |  0
 .../lib/appdata/schemas/SchemaRegistrySingle.java    |  0
 .../malhar}/lib/appdata/schemas/SchemaResult.java    |  0
 .../lib/appdata/schemas/SchemaResultSerializer.java  |  0
 .../malhar}/lib/appdata/schemas/SchemaUtils.java     |  0
 .../malhar}/lib/appdata/schemas/SnapshotSchema.java  |  0
 .../apex/malhar}/lib/appdata/schemas/TimeBucket.java |  0
 .../apex/malhar}/lib/appdata/schemas/Type.java       |  0
 .../snapshot/AbstractAppDataSnapshotServer.java      |  0
 .../appdata/snapshot/AppDataSnapshotServerMap.java   |  0
 .../appdata/snapshot/AppDataSnapshotServerPOJO.java  |  0
 .../lib/bandwidth/BandwidthLimitingOperator.java     |  0
 .../apex/malhar}/lib/bandwidth/BandwidthManager.java |  0
 .../malhar}/lib/bandwidth/BandwidthPartitioner.java  |  0
 .../lib/codec/JavaSerializationStreamCodec.java      |  0
 .../apex/malhar}/lib/codec/KryoJdkContainer.java     |  0
 .../lib/codec/KryoSerializableStreamCodec.java       |  0
 .../apache/apex/malhar}/lib/codec/package-info.java  |  0
 .../ByteArrayToStringConverterOperator.java          |  0
 .../apache/apex/malhar}/lib/converter/Converter.java |  0
 .../converter/MapToKeyHashValuePairConverter.java    |  0
 .../lib/converter/MapToKeyValuePairConverter.java    |  0
 .../StringValueToNumberConverterForMap.java          |  0
 .../apex/malhar}/lib/converter/package-info.java     |  0
 .../apex/malhar}/lib/counters/BasicCounters.java     |  0
 .../apex/malhar}/lib/counters/package-info.java      |  0
 ...teTransactionableKeyValueStoreOutputOperator.java |  0
 ...tAggregateTransactionableStoreOutputOperator.java |  0
 ...tractBatchTransactionableStoreOutputOperator.java |  0
 .../lib/db/AbstractKeyValueStoreInputOperator.java   |  0
 ...ruTransactionableKeyValueStoreOutputOperator.java |  0
 ...ctPassThruTransactionableStoreOutputOperator.java |  0
 .../malhar}/lib/db/AbstractStoreInputOperator.java   |  0
 .../malhar}/lib/db/AbstractStoreOutputOperator.java  |  0
 .../AbstractTransactionableStoreOutputOperator.java  |  0
 .../apache/apex/malhar}/lib/db/Connectable.java      |  0
 .../apache/apex/malhar}/lib/db/KeyValueStore.java    |  0
 .../apache/apex/malhar}/lib/db/Transactionable.java  |  0
 .../malhar}/lib/db/TransactionableKeyValueStore.java |  0
 .../apex/malhar}/lib/db/TransactionableStore.java    |  0
 .../cache/AbstractDBLookupCacheBackedOperator.java   |  0
 .../apex/malhar}/lib/db/cache/CacheManager.java      |  0
 .../apache/apex/malhar}/lib/db/cache/CacheStore.java |  0
 .../apex/malhar}/lib/db/cache/package-info.java      |  0
 .../lib/db/jdbc/AbstractJdbcInputOperator.java       |  0
 ...actJdbcNonTransactionableBatchOutputOperator.java |  0
 ...AbstractJdbcNonTransactionableOutputOperator.java |  0
 .../lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java  |  0
 .../lib/db/jdbc/AbstractJdbcPollInputOperator.java   |  0
 .../AbstractJdbcTransactionableOutputOperator.java   |  0
 .../lib/db/jdbc/JDBCDimensionalOutputOperator.java   |  0
 .../lib/db/jdbc/JDBCLookupCacheBackedOperator.java   |  0
 .../apex/malhar}/lib/db/jdbc/JdbcFieldInfo.java      |  0
 .../lib/db/jdbc/JdbcNonTransactionalStore.java       |  0
 .../malhar}/lib/db/jdbc/JdbcPOJOInputOperator.java   |  0
 .../lib/db/jdbc/JdbcPOJOInsertOutputOperator.java    |  0
 .../lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java |  0
 .../lib/db/jdbc/JdbcPOJOPollInputOperator.java       |  0
 .../malhar}/lib/db/jdbc/JdbcPollInputOperator.java   |  0
 .../apache/apex/malhar}/lib/db/jdbc/JdbcStore.java   |  0
 .../malhar}/lib/db/jdbc/JdbcTransactionalStore.java  |  0
 .../apex/malhar}/lib/db/jdbc/package-info.java       |  0
 .../apache/apex/malhar}/lib/db/package-info.java     |  0
 .../apex/malhar}/lib/expression/Expression.java      |  0
 .../malhar}/lib/expression/JavaExpressionParser.java |  0
 .../apex/malhar}/lib/fileaccess/DTFileReader.java    |  0
 .../apex/malhar}/lib/fileaccess/FileAccess.java      |  0
 .../malhar}/lib/fileaccess/FileAccessFSImpl.java     |  0
 .../apex/malhar}/lib/fileaccess/TFileImpl.java       |  0
 .../apex/malhar}/lib/fileaccess/TFileReader.java     |  0
 .../apex/malhar}/lib/fileaccess/TFileWriter.java     |  0
 .../apex/malhar}/lib/fileaccess/package-info.java    |  0
 .../apex/malhar}/lib/filter/FilterOperator.java      |  0
 .../apache/apex/malhar}/lib/formatter/Formatter.java |  0
 .../apex/malhar}/lib/formatter/JsonFormatter.java    |  0
 .../apex/malhar}/lib/formatter/XmlFormatter.java     |  0
 .../malhar}/lib/io/AbstractFTPInputOperator.java     |  0
 .../io/AbstractHttpGetMultiValuedMapOperator.java    |  0
 .../apex/malhar}/lib/io/AbstractHttpGetOperator.java |  0
 .../malhar}/lib/io/AbstractHttpInputOperator.java    |  0
 .../apex/malhar}/lib/io/AbstractHttpOperator.java    |  0
 .../lib/io/AbstractKeyValueStoreOutputOperator.java  |  0
 .../malhar}/lib/io/AbstractSocketInputOperator.java  |  0
 .../apex/malhar}/lib/io/ApacheGenRandomLogs.java     |  0
 .../lib/io/CollectionMultiConsoleOutputOperator.java |  0
 .../apex/malhar}/lib/io/ConsoleOutputOperator.java   |  0
 .../apex/malhar}/lib/io/HttpGetMapOperator.java      |  0
 .../malhar}/lib/io/HttpJsonChunksInputOperator.java  |  0
 .../apex/malhar}/lib/io/HttpLinesInputOperator.java  |  0
 .../apex/malhar}/lib/io/HttpOutputOperator.java      |  0
 .../apex/malhar}/lib/io/HttpPostOutputOperator.java  |  0
 .../malhar}/lib/io/IdempotentStorageManager.java     |  0
 .../lib/io/MapMultiConsoleOutputOperator.java        |  0
 .../malhar}/lib/io/PubSubWebSocketAppDataQuery.java  |  0
 .../malhar}/lib/io/PubSubWebSocketAppDataResult.java |  0
 .../malhar}/lib/io/PubSubWebSocketInputOperator.java |  0
 .../lib/io/PubSubWebSocketOutputOperator.java        |  0
 .../lib/io/SimpleSinglePortInputOperator.java        |  0
 .../apex/malhar}/lib/io/SmtpOutputOperator.java      |  0
 .../apex/malhar}/lib/io/WebSocketInputOperator.java  |  0
 .../apex/malhar}/lib/io/WebSocketOutputOperator.java |  0
 .../malhar}/lib/io/WebSocketServerInputOperator.java |  0
 .../apex/malhar}/lib/io/WidgetOutputOperator.java    |  0
 .../malhar}/lib/io/block/AbstractBlockReader.java    |  0
 .../malhar}/lib/io/block/AbstractFSBlockReader.java  |  0
 .../apex/malhar}/lib/io/block/BlockMetadata.java     |  0
 .../apex/malhar}/lib/io/block/BlockWriter.java       |  0
 .../apex/malhar}/lib/io/block/FSSliceReader.java     |  0
 .../apex/malhar}/lib/io/block/ReaderContext.java     |  0
 .../apex/malhar}/lib/io/block/package-info.java      |  0
 .../malhar}/lib/io/fs/AbstractFileInputOperator.java |  0
 .../lib/io/fs/AbstractFileOutputOperator.java        |  0
 .../apex/malhar}/lib/io/fs/AbstractFileSplitter.java |  0
 .../apex/malhar}/lib/io/fs/AbstractReconciler.java   |  0
 .../lib/io/fs/AbstractSingleFileOutputOperator.java  |  0
 .../io/fs/AbstractThroughputFileInputOperator.java   |  0
 .../lib/io/fs/AbstractWindowFileOutputOperator.java  |  0
 .../apache/apex/malhar}/lib/io/fs/FSInputModule.java |  0
 .../apache/apex/malhar}/lib/io/fs/FileMerger.java    |  0
 .../apache/apex/malhar}/lib/io/fs/FileSplitter.java  |  0
 .../apex/malhar}/lib/io/fs/FileSplitterBase.java     |  0
 .../apex/malhar}/lib/io/fs/FileSplitterInput.java    |  0
 .../apache/apex/malhar}/lib/io/fs/FileStitcher.java  |  0
 .../apex/malhar}/lib/io/fs/FilterStreamCodec.java    |  0
 .../apex/malhar}/lib/io/fs/FilterStreamContext.java  |  0
 .../apex/malhar}/lib/io/fs/FilterStreamProvider.java |  0
 .../apex/malhar}/lib/io/fs/HDFSFileCopyModule.java   |  0
 .../apex/malhar}/lib/io/fs/HDFSFileMerger.java       |  0
 .../apache/apex/malhar}/lib/io/fs/S3BlockReader.java |  0
 .../apache/apex/malhar}/lib/io/fs/S3InputModule.java |  0
 .../apache/apex/malhar}/lib/io/fs/Synchronizer.java  |  0
 .../apex/malhar}/lib/io/fs/TailFsInputOperator.java  |  0
 .../apache/apex/malhar}/lib/io/fs/package-info.java  |  0
 .../malhar}/lib/io/jms/AbstractJMSInputOperator.java |  0
 .../lib/io/jms/AbstractJMSOutputOperator.java        |  0
 .../io/jms/AbstractJMSSinglePortOutputOperator.java  |  0
 .../lib/io/jms/FSPsuedoTransactionableStore.java     |  0
 .../apache/apex/malhar}/lib/io/jms/JMSBase.java      |  0
 .../lib/io/jms/JMSBaseTransactionableStore.java      |  0
 .../lib/io/jms/JMSMultiPortOutputOperator.java       |  0
 .../malhar}/lib/io/jms/JMSObjectInputOperator.java   |  0
 .../malhar}/lib/io/jms/JMSStringInputOperator.java   |  0
 .../malhar}/lib/io/jms/JMSTransactionableStore.java  |  0
 .../apache/apex/malhar}/lib/io/jms/package-info.java |  0
 .../apache/apex/malhar}/lib/io/package-info.java     |  0
 .../apex/malhar}/lib/join/AbstractJoinOperator.java  |  0
 .../apex/malhar}/lib/join/AntiJoinOperator.java      |  0
 .../apache/apex/malhar}/lib/join/Bucket.java         |  0
 .../apache/apex/malhar}/lib/join/InMemoryStore.java  |  0
 .../apache/apex/malhar}/lib/join/JoinStore.java      |  0
 .../apex/malhar}/lib/join/MapJoinOperator.java       |  0
 .../apex/malhar}/lib/join/POJOJoinOperator.java      |  0
 .../apex/malhar}/lib/join/SemiJoinOperator.java      |  0
 .../apache/apex/malhar}/lib/join/TimeBasedStore.java |  0
 .../apache/apex/malhar}/lib/join/TimeEvent.java      |  0
 .../apache/apex/malhar}/lib/join/TimeEventImpl.java  |  0
 .../lib/logs/ApacheLogParseMapOutputOperator.java    |  0
 .../malhar}/lib/logs/ApacheLogParseOperator.java     |  0
 .../lib/logs/ApacheVirtualLogParseOperator.java      |  0
 .../lib/logs/DimensionAggregationUnifier.java        |  0
 .../apex/malhar}/lib/logs/DimensionObject.java       |  0
 .../lib/logs/FilteredLineToTokenArrayList.java       |  0
 .../malhar}/lib/logs/FilteredLineToTokenHashMap.java |  0
 .../lib/logs/FilteredLineTokenizerKeyVal.java        |  0
 .../apex/malhar}/lib/logs/InformationExtractor.java  |  0
 .../apex/malhar}/lib/logs/LineToTokenArrayList.java  |  0
 .../apex/malhar}/lib/logs/LineToTokenHashMap.java    |  0
 .../apache/apex/malhar}/lib/logs/LineTokenizer.java  |  0
 .../apex/malhar}/lib/logs/LineTokenizerKeyVal.java   |  0
 .../lib/logs/MultiWindowDimensionAggregation.java    |  0
 .../apex/malhar}/lib/logs/RegexMatchMapOperator.java |  0
 .../apache/apex/malhar}/lib/logs/package-info.java   |  0
 .../apex/malhar}/lib/math/AbstractAggregateCalc.java |  0
 .../apache/apex/malhar}/lib/math/AbstractOutput.java |  0
 .../lib/math/AbstractXmlCartesianProduct.java        |  0
 .../math/AbstractXmlKeyValueCartesianProduct.java    |  0
 .../apache/apex/malhar}/lib/math/Average.java        |  0
 .../apache/apex/malhar}/lib/math/AverageKeyVal.java  |  0
 .../apache/apex/malhar}/lib/math/Division.java       |  0
 .../apache/apex/malhar}/lib/math/LogicalCompare.java |  0
 .../malhar}/lib/math/LogicalCompareToConstant.java   |  0
 .../apache/apex/malhar}/lib/math/Margin.java         |  0
 .../apache/apex/malhar}/lib/math/MarginKeyVal.java   |  0
 .../apache/apex/malhar}/lib/math/MarginMap.java      |  0
 .../apache/apex/malhar}/lib/math/Max.java            |  0
 .../apache/apex/malhar}/lib/math/MaxKeyVal.java      |  0
 .../apache/apex/malhar}/lib/math/Min.java            |  0
 .../apache/apex/malhar}/lib/math/MinKeyVal.java      |  0
 .../apex/malhar}/lib/math/MultiplyByConstant.java    |  0
 .../apache/apex/malhar}/lib/math/Range.java          |  0
 .../apache/apex/malhar}/lib/math/RangeKeyVal.java    |  0
 .../apache/apex/malhar}/lib/math/RunningAverage.java |  0
 .../apache/apex/malhar}/lib/math/Sigma.java          |  0
 .../lib/math/SingleVariableAbstractCalculus.java     |  0
 .../apache/apex/malhar}/lib/math/SquareCalculus.java |  0
 .../apache/apex/malhar}/lib/math/Sum.java            |  0
 .../apache/apex/malhar}/lib/math/SumKeyVal.java      |  0
 .../lib/math/XmlKeyValueStringCartesianProduct.java  |  0
 .../apache/apex/malhar}/lib/math/package-info.java   |  0
 .../apex/malhar}/lib/metric/AvgAggregator.java       |  0
 .../malhar}/lib/metric/max/DoubleMaxAggregator.java  |  0
 .../malhar}/lib/metric/max/FloatMaxAggregator.java   |  0
 .../malhar}/lib/metric/max/IntMaxAggregator.java     |  0
 .../malhar}/lib/metric/max/LongMaxAggregator.java    |  0
 .../malhar}/lib/metric/min/DoubleMinAggregator.java  |  0
 .../malhar}/lib/metric/min/FloatMinAggregator.java   |  0
 .../malhar}/lib/metric/min/IntMinAggregator.java     |  0
 .../malhar}/lib/metric/min/LongMinAggregator.java    |  0
 .../apache/apex/malhar}/lib/metric/package-info.java |  0
 .../lib/multiwindow/AbstractSlidingWindow.java       |  0
 .../lib/multiwindow/AbstractSlidingWindowKeyVal.java |  0
 .../lib/multiwindow/MultiWindowRangeKeyVal.java      |  0
 .../lib/multiwindow/MultiWindowSumKeyVal.java        |  0
 .../malhar}/lib/multiwindow/SimpleMovingAverage.java |  0
 .../lib/multiwindow/SimpleMovingAverageObject.java   |  0
 .../malhar}/lib/multiwindow/SortedMovingWindow.java  |  0
 .../apex/malhar}/lib/multiwindow/package-info.java   |  0
 .../apache/apex/malhar}/lib/parser/Parser.java       |  0
 .../apache/apex/malhar}/lib/parser/XmlParser.java    |  0
 .../apache/apex/malhar}/lib/parser/package-info.java |  0
 .../StatelessThroughputBasedPartitioner.java         |  0
 .../partitioner/StatsAwareStatelessPartitioner.java  |  0
 .../apex/malhar}/lib/partitioner/package-info.java   |  0
 .../malhar}/lib/projection/ProjectionOperator.java   |  0
 .../apex/malhar}/lib/script/JavaScriptOperator.java  |  0
 .../apex/malhar}/lib/script/ScriptOperator.java      |  0
 .../apache/apex/malhar}/lib/script/package-info.java |  0
 .../apex/malhar}/lib/statistics/MedianOperator.java  |  0
 .../apex/malhar}/lib/statistics/ModeOperator.java    |  0
 .../malhar}/lib/statistics/StandardDeviation.java    |  0
 .../malhar}/lib/statistics/WeightedMeanOperator.java |  0
 .../apex/malhar}/lib/statistics/package-info.java    |  0
 .../apex/malhar}/lib/stream/AbstractAggregator.java  |  0
 .../apex/malhar}/lib/stream/ArrayListAggregator.java |  0
 .../apex/malhar}/lib/stream/ArrayListToItem.java     |  0
 .../apex/malhar}/lib/stream/ConsolidatorKeyVal.java  |  0
 .../apache/apex/malhar}/lib/stream/Counter.java      |  0
 .../apache/apex/malhar}/lib/stream/DevNull.java      |  0
 .../apex/malhar}/lib/stream/DevNullCounter.java      |  0
 .../apex/malhar}/lib/stream/HashMapToKeyValPair.java |  0
 .../malhar}/lib/stream/JsonByteArrayOperator.java    |  0
 .../apex/malhar}/lib/stream/KeyValPairToHashMap.java |  0
 .../apex/malhar}/lib/stream/RoundRobinHashMap.java   |  0
 .../apex/malhar}/lib/stream/StreamDuplicater.java    |  0
 .../apache/apex/malhar}/lib/stream/StreamMerger.java |  0
 .../apache/apex/malhar}/lib/stream/package-info.java |  0
 .../malhar}/lib/streamquery/condition/Condition.java |  0
 .../condition/JoinColumnEqualCondition.java          |  0
 .../malhar}/lib/streamquery/index/ColumnIndex.java   |  0
 .../apex/malhar}/lib/streamquery/index/Index.java    |  0
 .../malhar}/lib/testbench/ArrayListTestSink.java     |  0
 .../malhar}/lib/testbench/CollectorTestSink.java     |  0
 .../malhar}/lib/testbench/CompareFilterTuples.java   |  0
 .../lib/testbench/CountAndLastTupleTestSink.java     |  0
 .../apex/malhar}/lib/testbench/CountOccurance.java   |  0
 .../apex/malhar}/lib/testbench/CountTestSink.java    |  0
 .../apex/malhar}/lib/testbench/EventClassifier.java  |  0
 .../testbench/EventClassifierNumberToHashDouble.java |  0
 .../apex/malhar}/lib/testbench/EventGenerator.java   |  0
 .../apex/malhar}/lib/testbench/EventIncrementer.java |  0
 .../apex/malhar}/lib/testbench/FilterClassifier.java |  0
 .../lib/testbench/FilteredEventClassifier.java       |  0
 .../apex/malhar}/lib/testbench/HashTestSink.java     |  0
 .../apex/malhar}/lib/testbench/HttpStatusFilter.java |  0
 .../apache/apex/malhar}/lib/testbench/KeyValSum.java |  0
 .../malhar}/lib/testbench/RandomEventGenerator.java  |  0
 .../malhar}/lib/testbench/RandomWordGenerator.java   |  0
 .../apex/malhar}/lib/testbench/RedisSumOper.java     |  0
 .../malhar}/lib/testbench/SeedEventClassifier.java   |  0
 .../malhar}/lib/testbench/SeedEventGenerator.java    |  0
 .../apex/malhar}/lib/testbench/SumTestSink.java      |  0
 .../malhar}/lib/testbench/ThroughputCounter.java     |  0
 .../apex/malhar}/lib/testbench/TopOccurrence.java    |  0
 .../apex/malhar}/lib/testbench/package-info.java     |  0
 .../malhar}/lib/transform/TransformOperator.java     |  0
 .../malhar}/lib/util/AbstractBaseFrequentKey.java    |  0
 .../lib/util/AbstractBaseFrequentKeyValueMap.java    |  0
 .../malhar}/lib/util/AbstractBaseMatchOperator.java  |  0
 .../lib/util/AbstractBaseNNonUniqueOperatorMap.java  |  0
 .../malhar}/lib/util/AbstractBaseNOperatorMap.java   |  0
 .../lib/util/AbstractBaseNUniqueOperatorMap.java     |  0
 .../malhar}/lib/util/AbstractBaseSortOperator.java   |  0
 .../util/AbstractDimensionTimeBucketOperator.java    |  0
 .../lib/util/AbstractKeyValueStorageAgent.java       |  0
 .../malhar}/lib/util/ActiveMQMessageListener.java    |  0
 .../lib/util/ActiveMQMultiTypeMessageListener.java   |  0
 .../apex/malhar}/lib/util/ArrayHashMapFrequent.java  |  0
 .../lib/util/BaseFilteredKeyValueOperator.java       |  0
 .../apex/malhar}/lib/util/BaseKeyOperator.java       |  0
 .../apex/malhar}/lib/util/BaseKeyValueOperator.java  |  0
 .../apex/malhar}/lib/util/BaseLineTokenizer.java     |  0
 .../apex/malhar}/lib/util/BaseMatchOperator.java     |  0
 .../malhar}/lib/util/BaseNumberKeyValueOperator.java |  0
 .../malhar}/lib/util/BaseNumberValueOperator.java    |  0
 .../apex/malhar}/lib/util/BaseUniqueKeyCounter.java  |  0
 .../malhar}/lib/util/BaseUniqueKeyValueCounter.java  |  0
 .../lib/util/DimensionTimeBucketSumOperator.java     |  0
 .../apache/apex/malhar}/lib/util/FieldInfo.java      |  0
 .../apex/malhar}/lib/util/FieldValueGenerator.java   |  0
 .../apache/apex/malhar}/lib/util/FilterOperator.java |  0
 .../apache/apex/malhar}/lib/util/HighLow.java        |  0
 .../malhar}/lib/util/JavaScriptFilterOperator.java   |  0
 .../apache/apex/malhar}/lib/util/KeyHashValPair.java |  0
 .../apache/apex/malhar}/lib/util/KeyValPair.java     |  0
 .../apache/apex/malhar}/lib/util/KryoCloneUtils.java |  0
 .../apache/apex/malhar}/lib/util/PojoUtils.java      |  0
 .../apex/malhar}/lib/util/ReusableStringReader.java  |  0
 .../apex/malhar}/lib/util/ReversibleComparator.java  |  0
 .../malhar}/lib/util/StorageAgentKeyValueStore.java  |  0
 .../apache/apex/malhar}/lib/util/TableInfo.java      |  0
 .../apache/apex/malhar}/lib/util/TimeBucketKey.java  |  0
 .../apache/apex/malhar}/lib/util/TopNSort.java       |  0
 .../apache/apex/malhar}/lib/util/TopNUniqueSort.java |  0
 .../lib/util/UnifierArrayHashMapFrequent.java        |  0
 .../apex/malhar}/lib/util/UnifierArrayList.java      |  0
 .../apex/malhar}/lib/util/UnifierBooleanAnd.java     |  0
 .../apex/malhar}/lib/util/UnifierBooleanOr.java      |  0
 .../apex/malhar}/lib/util/UnifierCountOccurKey.java  |  0
 .../apache/apex/malhar}/lib/util/UnifierHashMap.java |  0
 .../malhar}/lib/util/UnifierHashMapFrequent.java     |  0
 .../apex/malhar}/lib/util/UnifierHashMapInteger.java |  0
 .../apex/malhar}/lib/util/UnifierHashMapRange.java   |  0
 .../apex/malhar}/lib/util/UnifierHashMapSumKeys.java |  0
 .../apex/malhar}/lib/util/UnifierKeyValRange.java    |  0
 .../apache/apex/malhar}/lib/util/UnifierMap.java     |  0
 .../apache/apex/malhar}/lib/util/UnifierRange.java   |  0
 .../apex/malhar}/lib/util/UnifierSumNumber.java      |  0
 .../malhar}/lib/util/comparator/SliceComparator.java |  0
 .../apache/apex/malhar}/lib/util/package-info.java   |  0
 .../apex/malhar}/lib/util/time/WindowUtils.java      |  0
 .../apex/malhar}/lib/xml/AbstractXmlDOMOperator.java |  0
 .../apache/apex/malhar}/lib/algo/BottomNMapTest.java |  0
 .../apex/malhar}/lib/algo/BottomNUnifierTest.java    |  0
 .../apex/malhar}/lib/algo/BottomNUniqueMapTest.java  |  0
 .../malhar}/lib/algo/CompareExceptCountMapTest.java  |  0
 .../apache/apex/malhar}/lib/algo/DistinctTest.java   |  0
 .../apex/malhar}/lib/algo/FilterValuesTest.java      |  0
 .../apache/apex/malhar}/lib/algo/InsertSortTest.java |  0
 .../apex/malhar}/lib/algo/LeastFrequentKeyTest.java  |  0
 .../apex/malhar}/lib/algo/MatchAllMapTest.java       |  0
 .../apex/malhar}/lib/algo/MatchAnyMapTest.java       |  0
 .../apex/malhar}/lib/algo/MergeSortNumberTest.java   |  0
 .../apex/malhar}/lib/algo/MostFrequentKeyTest.java   |  0
 .../apache/apex/malhar}/lib/algo/TopNTest.java       |  0
 .../apache/apex/malhar}/lib/algo/TopNUniqueTest.java |  0
 .../apex/malhar}/lib/algo/UniqueCounterTest.java     |  0
 .../apex/malhar}/lib/algo/UniqueValueCountTest.java  |  0
 .../apache/apex/malhar}/lib/appdata/ThreadUtils.java |  0
 .../datastructs/CacheLRUSynchronousFlushTest.java    |  0
 .../appdata/datastructs/DimensionalTableTest.java    |  0
 .../dimensions/CustomTimeBucketRegistryTest.java     |  0
 .../lib/appdata/dimensions/DimensionsEventTest.java  |  0
 .../apex/malhar}/lib/appdata/gpo/GPOMutableTest.java |  0
 .../apex/malhar}/lib/appdata/gpo/GPOUtilsTest.java   |  0
 .../lib/appdata/gpo/SerdeFieldsDescriptorTest.java   |  0
 .../lib/appdata/gpo/SerdeListGPOMutableTest.java     |  0
 .../lib/appdata/gpo/SerdeListPrimitiveTest.java      |  0
 .../malhar}/lib/appdata/gpo/SerdeListStringTest.java |  0
 .../apex/malhar}/lib/appdata/query/MockQuery.java    |  0
 .../apex/malhar}/lib/appdata/query/MockResult.java   |  0
 .../lib/appdata/query/MockResultSerializer.java      |  0
 .../appdata/query/QueryManagerAsynchronousTest.java  |  0
 .../appdata/query/QueryManagerSynchronousTest.java   |  0
 .../malhar}/lib/appdata/query/QueueUtilsTest.java    |  0
 .../query/SimpleDoneQueryQueueManagerTest.java       |  0
 .../appdata/query/SimpleQueryQueueManagerTest.java   |  0
 .../lib/appdata/query/WEQueryQueueManagerTest.java   |  0
 .../lib/appdata/query/WindowBoundedServiceTest.java  |  0
 .../query/serde/MessageDeserializerFactoryTest.java  |  0
 .../appdata/query/serde/SimpleDataValidatorTest.java |  0
 .../lib/appdata/schemas/CustomTimeBucketTest.java    |  0
 .../schemas/DataQuerySnapshotDeserializerTest.java   |  0
 .../lib/appdata/schemas/DataQuerySnapshotTest.java   |  0
 .../schemas/DataResultSnapshotSerializerTest.java    |  0
 .../schemas/DimensionalConfigurationSchemaTest.java  |  0
 .../lib/appdata/schemas/DimensionalSchemaTest.java   |  0
 .../lib/appdata/schemas/FieldsDescriptorTest.java    |  0
 .../lib/appdata/schemas/ResultFormatterTest.java     |  0
 .../malhar}/lib/appdata/schemas/SchemaQueryTest.java |  0
 .../appdata/schemas/SchemaRegistryMultipleTest.java  |  0
 .../appdata/schemas/SchemaRegistrySingleTest.java    |  0
 .../malhar}/lib/appdata/schemas/SchemaTestUtils.java |  0
 .../malhar}/lib/appdata/schemas/SchemaUtilsTest.java |  0
 .../lib/appdata/schemas/SnapshotSchemaTest.java      |  0
 .../malhar}/lib/appdata/schemas/TimeBucketTest.java  |  0
 .../snapshot/AppDataSnapshotServerMapTest.java       |  0
 .../snapshot/AppDataSnapshotServerPojoTest.java      |  0
 .../AppDataSnapshotServerTagsSupportTest.java        |  0
 .../malhar}/lib/bandwidth/BandwidthManagerTest.java  |  0
 .../lib/bandwidth/BandwidthPartitionerTest.java      |  0
 .../lib/codec/JavaSerializationStreamCodecTest.java  |  0
 .../apex/malhar}/lib/codec/KryoStreamCodecTest.java  |  0
 .../converter/ByteArrayToStringConverterTest.java    |  0
 .../converter/MapToKeyValuePairConverterTest.java    |  0
 .../StringValueToNumberConverterForMapTest.java      |  0
 .../apex/malhar}/lib/counters/BasicCountersTest.java |  0
 .../malhar}/lib/db/KeyValueStoreOperatorTest.java    |  0
 .../db/TransactionableKeyValueStoreOperatorTest.java |  0
 .../apex/malhar}/lib/db/cache/CacheManagerTest.java  |  0
 .../apex/malhar}/lib/db/cache/CacheStoreTest.java    |  0
 .../db/jdbc/JDBCLookupCacheBackedOperatorTest.java   |  0
 .../apache/apex/malhar}/lib/db/jdbc/JdbcIOApp.java   |  0
 .../apex/malhar}/lib/db/jdbc/JdbcIOAppTest.java      |  0
 .../db/jdbc/JdbcInputOperatorApplicationTest.java    |  0
 .../JdbcNonTransactionalBatchOutputOperatorTest.java |  0
 .../jdbc/JdbcNonTransactionalOutputOperatorTest.java |  0
 .../lib/db/jdbc/JdbcNonTransactionalStoreTest.java   |  0
 .../apex/malhar}/lib/db/jdbc/JdbcOperatorTest.java   |  0
 .../lib/db/jdbc/JdbcPojoOperatorApplicationTest.java |  0
 .../malhar}/lib/db/jdbc/JdbcPojoOperatorTest.java    |  0
 .../lib/db/jdbc/JdbcPojoPollableOpeartorTest.java    |  0
 .../apex/malhar}/lib/db/jdbc/JdbcStoreTest.java      |  0
 .../apex/malhar}/lib/filter/FilterAppTest.java       |  0
 .../apache/apex/malhar}/lib/filter/FilterTest.java   |  0
 .../malhar}/lib/formatter/JsonFormatterTest.java     |  0
 .../apex/malhar}/lib/formatter/XmlFormatterTest.java |  0
 .../lib/helper/OperatorContextTestHelper.java        |  0
 .../lib/helper/SamplePubSubWebSocketServlet.java     |  0
 .../apex/malhar}/lib/helper/TestPortContext.java     |  0
 .../apex/malhar}/lib/io/ApacheRandomLogsTest.java    |  0
 .../malhar}/lib/io/FTPStringInputOperatorTest.java   |  0
 .../apex/malhar}/lib/io/HttpGetMapOperatorTest.java  |  0
 .../lib/io/HttpJsonChunksInputOperatorTest.java      |  0
 .../malhar}/lib/io/HttpLinesInputOperatorTest.java   |  0
 .../lib/io/HttpMultiValuedMapGetOperatorTest.java    |  0
 .../malhar}/lib/io/HttpPostOutputOperatorTest.java   |  0
 .../malhar}/lib/io/IdempotentStorageManagerTest.java |  0
 .../lib/io/PubSubWebSocketAppDataOperatorTest.java   |  0
 .../lib/io/PubSubWebSocketAppDataQueryTest.java      |  0
 .../lib/io/PubSubWebSocketAppDataResultTest.java     |  0
 .../malhar}/lib/io/PubSubWebSocketOperatorTest.java  |  0
 .../apex/malhar}/lib/io/SmtpOutputOperatorTest.java  |  0
 .../apex/malhar}/lib/io/SocketInputOperatorTest.java |  0
 .../lib/io/WebSocketServerInputOperatorTest.java     |  0
 .../lib/io/block/AbstractBlockReaderTest.java        |  0
 .../apex/malhar}/lib/io/block/FSLineReaderTest.java  |  0
 .../apex/malhar}/lib/io/block/FSSliceReaderTest.java |  0
 .../lib/io/block/ReadAheadLineReaderTest.java        |  0
 ...AbstractFileInputOperatorFailureHandlingTest.java |  0
 .../lib/io/fs/AbstractFileInputOperatorTest.java     |  0
 .../lib/io/fs/AbstractFileOutputOperatorTest.java    |  0
 .../malhar}/lib/io/fs/AbstractReconcilerTest.java    |  0
 .../io/fs/AbstractSingleFileOutputOperatorTest.java  |  0
 .../fs/AbstractThroughputFileInputOperatorTest.java  |  0
 .../io/fs/AbstractWindowFileOutputOperatorTest.java  |  0
 .../apex/malhar}/lib/io/fs/BlockWriterTest.java      |  0
 .../apex/malhar}/lib/io/fs/FSInputModuleAppTest.java |  0
 .../apex/malhar}/lib/io/fs/FSInputModuleTest.java    |  0
 .../lib/io/fs/FastMergerDecisionMakerTest.java       |  0
 .../apex/malhar}/lib/io/fs/FileMergerTest.java       |  0
 .../apex/malhar}/lib/io/fs/FileSplitterBaseTest.java |  0
 .../malhar}/lib/io/fs/FileSplitterInputTest.java     |  0
 .../apex/malhar}/lib/io/fs/FileSplitterTest.java     |  0
 .../apex/malhar}/lib/io/fs/FileStitcherTest.java     |  0
 .../apex/malhar}/lib/io/fs/S3InputModuleAppTest.java |  0
 .../apex/malhar}/lib/io/fs/SynchronizerTest.java     |  0
 .../malhar}/lib/io/fs/TailFsInputOperatorTest.java   |  0
 .../lib/io/jms/FSPsuedoTransactionableStoreTest.java |  0
 .../lib/io/jms/JMSMultiPortOutputOperatorTest.java   |  0
 .../lib/io/jms/JMSObjectInputOperatorTest.java       |  0
 .../malhar}/lib/io/jms/JMSOutputOperatorTest.java    |  0
 .../lib/io/jms/JMSStringInputOperatorTest.java       |  0
 .../apache/apex/malhar}/lib/io/jms/JMSTestBase.java  |  0
 .../lib/io/jms/JMSTransactionableStoreTest.java      |  0
 .../lib/io/jms/JMSTransactionableStoreTestBase.java  |  0
 .../lib/io/jms/SQSStringInputOperatorTest.java       |  0
 .../apache/apex/malhar}/lib/io/jms/SQSTestBase.java  |  0
 .../apex/malhar}/lib/join/AntiJoinOperatorTest.java  |  0
 .../malhar}/lib/join/MapTimeBasedJoinOperator.java   |  0
 .../lib/join/POJOTimeBasedJoinOperatorTest.java      |  0
 .../apex/malhar}/lib/join/SemiJoinOperatorTest.java  |  0
 .../logs/ApacheLogParseMapOutputOperatorTest.java    |  0
 .../malhar}/lib/logs/ApacheLogParseOperatorTest.java |  0
 .../lib/logs/FilteredLineToTokenArrayListTest.java   |  0
 .../lib/logs/FilteredLineToTokenHashMapTest.java     |  0
 .../lib/logs/FilteredLineTokenizerKeyValTest.java    |  0
 .../malhar}/lib/logs/LineToTokenArrayListTest.java   |  0
 .../malhar}/lib/logs/LineToTokenHashMapTest.java     |  0
 .../malhar}/lib/logs/LineTokenizerKeyValTest.java    |  0
 .../apex/malhar}/lib/logs/LineTokenizerTest.java     |  0
 .../logs/MultiWindowDimensionAggregationTest.java    |  0
 .../malhar}/lib/logs/RegexMatchMapOperatorTest.java  |  0
 .../malhar}/lib/logs/TopNUniqueSiteStatsTest.java    |  0
 .../apex/malhar}/lib/math/AverageKeyValTest.java     |  0
 .../apache/apex/malhar}/lib/math/AverageTest.java    |  0
 .../apex/malhar}/lib/math/CountOccuranceTest.java    |  0
 .../apache/apex/malhar}/lib/math/DivisionTest.java   |  0
 .../apex/malhar}/lib/math/LogicalCompareTest.java    |  0
 .../lib/math/LogicalCompareToConstantTest.java       |  0
 .../apex/malhar}/lib/math/MarginKeyValTest.java      |  0
 .../apache/apex/malhar}/lib/math/MarginMapTest.java  |  0
 .../apache/apex/malhar}/lib/math/MarginTest.java     |  0
 .../apache/apex/malhar}/lib/math/MaxKeyValTest.java  |  0
 .../apache/apex/malhar}/lib/math/MaxTest.java        |  0
 .../apache/apex/malhar}/lib/math/MinKeyValTest.java  |  0
 .../apache/apex/malhar}/lib/math/MinTest.java        |  0
 .../malhar}/lib/math/MultiplyByConstantTest.java     |  0
 .../apex/malhar}/lib/math/RangeKeyValTest.java       |  0
 .../apache/apex/malhar}/lib/math/RangeTest.java      |  0
 .../apex/malhar}/lib/math/RunningAverageTest.java    |  0
 .../apache/apex/malhar}/lib/math/SigmaTest.java      |  0
 .../apex/malhar}/lib/math/SquareCalculusTest.java    |  0
 .../apache/apex/malhar}/lib/math/SumKeyValTest.java  |  0
 .../apache/apex/malhar}/lib/math/SumTest.java        |  0
 .../math/XmlKeyValueStringCartesianProductTest.java  |  0
 .../lib/multiwindow/MultiWindowRangeKeyValTest.java  |  0
 .../lib/multiwindow/MultiWindowSumKeyValTest.java    |  0
 .../lib/multiwindow/SimpleMovingAverageTest.java     |  0
 .../malhar}/lib/multiwindow/SlidingWindowTest.java   |  0
 .../lib/multiwindow/SortedMovingWindowTest.java      |  0
 .../malhar}/lib/parser/XmlParserApplicationTest.java |  0
 .../apex/malhar}/lib/parser/XmlParserTest.java       |  0
 .../lib/partitioner/StatelessPartitionerTest.java    |  0
 .../StatelessThroughputBasedPartitionerTest.java     |  0
 .../apex/malhar}/lib/projection/ActivateTest.java    |  0
 .../apex/malhar}/lib/projection/ProjectionTest.java  |  0
 .../malhar}/lib/script/JavaScriptOperatorTest.java   |  0
 .../malhar}/lib/statistics/MeridianOperatorTest.java |  0
 .../malhar}/lib/statistics/ModeOperatorTest.java     |  0
 .../statistics/StandardDeviationOperatorTest.java    |  0
 .../lib/statistics/WeightedMeanOperatorTest.java     |  0
 .../malhar}/lib/stream/ArrayListAggregatorTest.java  |  0
 .../apex/malhar}/lib/stream/ArrayListToItemTest.java |  0
 .../malhar}/lib/stream/ConsolidatorKeyValTest.java   |  0
 .../apache/apex/malhar}/lib/stream/CounterTest.java  |  0
 .../apex/malhar}/lib/stream/DevNullCounterTest.java  |  0
 .../apache/apex/malhar}/lib/stream/DevNullTest.java  |  0
 .../malhar}/lib/stream/HashMapToKeyValPairTest.java  |  0
 .../lib/stream/JsonByteArrayOperatorTest.java        |  0
 .../malhar}/lib/stream/KeyPairToHashMapTest.java     |  0
 .../malhar}/lib/stream/RoundRobinHashMapTest.java    |  0
 .../malhar}/lib/stream/StreamDuplicaterTest.java     |  0
 .../apex/malhar}/lib/stream/StreamMergerTest.java    |  0
 .../lib/testbench/ActiveMQMessageGenerator.java      |  0
 .../malhar}/lib/testbench/EventClassifierTest.java   |  0
 .../malhar}/lib/testbench/EventGeneratorTest.java    |  0
 .../malhar}/lib/testbench/EventIncrementerTest.java  |  0
 .../lib/testbench/FilteredEventClassifierTest.java   |  0
 .../lib/testbench/RandomEventGeneratorTest.java      |  0
 .../lib/testbench/RandomWordGeneratorTest.java       |  0
 .../lib/testbench/SeedEventClassifierTest.java       |  0
 .../lib/testbench/SeedEventGeneratorTest.java        |  0
 .../malhar}/lib/testbench/ThroughputCounterTest.java |  0
 .../lib/transform/TransformOperatorAppTest.java      |  0
 .../malhar}/lib/transform/TransformOperatorTest.java |  0
 .../lib/util/DimensionTimeBucketSumOperatorTest.java |  0
 .../lib/util/JavaScriptFilterOperatorTest.java       |  0
 .../apex/malhar}/lib/util/KryoCloneUtilsTest.java    |  0
 .../apache/apex/malhar}/lib/util/PojoUtilsTest.java  |  0
 .../apex/malhar}/lib/util/TestObjAllTypes.java       |  0
 .../apache/apex/malhar}/lib/util/TestUtils.java      |  0
 .../apex/malhar}/lib/util/time/WindowUtilsTest.java  |  0
 1127 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/ApplicationFixed.java b/benchmark/src/main/java/org/apache/apex/benchmark/ApplicationFixed.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/ApplicationFixed.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/ApplicationFixed.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/Benchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/Benchmark.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/Benchmark.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/Benchmark.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseAppInput.java b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppInput.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseAppInput.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppInput.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseAppOutput.java b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppOutput.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseAppOutput.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseAppOutput.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseInputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseInputOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseInputOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseInputOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseOutputOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/CouchBaseOutputOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/CouchBaseOutputOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/FixedTuplesInputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/FixedTuplesInputOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/FixedTuplesInputOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/FixedTuplesInputOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/RandomMapOutput.java b/benchmark/src/main/java/org/apache/apex/benchmark/RandomMapOutput.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/RandomMapOutput.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/RandomMapOutput.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/RandomWordInputModule.java b/benchmark/src/main/java/org/apache/apex/benchmark/RandomWordInputModule.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/RandomWordInputModule.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/RandomWordInputModule.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/WordCountOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/WordCountOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/WordCountOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/WordCountOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java b/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputBenchmarkApplication.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/aerospike/AerospikeOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/aerospike/AerospikeOutputOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/aerospike/AerospikeOutputOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkApplication.java b/benchmark/src/main/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkApplication.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkApplication.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkApplication.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/cassandra/CassandraOutputBenchmarkApplication.java b/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputBenchmarkApplication.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/cassandra/CassandraOutputBenchmarkApplication.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputBenchmarkApplication.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/cassandra/CassandraOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/cassandra/CassandraOutputOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/cassandra/CassandraOutputOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/fs/FSByteOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSByteOutputOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/fs/FSByteOutputOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/fs/FSByteOutputOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/fs/FSOutputOperatorBenchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/fs/FSOutputOperatorBenchmark.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/fs/FSOutputOperatorBenchmark.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/fs/FSOutputOperatorBenchmark.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/hive/HiveInsertBenchmarkingApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkingApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/hive/HiveInsertBenchmarkingApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkingApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/hive/HiveMapInsertBenchmarkingApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveMapInsertBenchmarkingApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/hive/HiveMapInsertBenchmarkingApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/hive/HiveMapInsertBenchmarkingApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/kafka/BenchmarkKafkaInputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkKafkaInputOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/kafka/BenchmarkKafkaInputOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkKafkaInputOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/kafka/BenchmarkPartitionableKafkaOutputOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/kafka/KafkaInputBenchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmark.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/kafka/KafkaInputBenchmark.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmark.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/kafka/KafkaOutputBenchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmark.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/kafka/KafkaOutputBenchmark.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmark.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/kafka/KafkaTestPartitioner.java b/benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaTestPartitioner.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/kafka/KafkaTestPartitioner.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/kafka/KafkaTestPartitioner.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/package-info.java b/benchmark/src/main/java/org/apache/apex/benchmark/package-info.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/package-info.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/package-info.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkApplication.java b/benchmark/src/main/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkApplication.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkApplication.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkApplication.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/spillable/SpillableBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/spillable/SpillableBenchmarkApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/spillable/SpillableTestInputOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestInputOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/spillable/SpillableTestInputOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestInputOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/spillable/SpillableTestOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/spillable/SpillableTestOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/spillable/SpillableTestOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/state/ManagedStateBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/state/ManagedStateBenchmarkApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/state/StoreOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/state/StoreOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/state/StoreOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/state/StoreOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/stream/DevNullCounterBenchmark.java b/benchmark/src/main/java/org/apache/apex/benchmark/stream/DevNullCounterBenchmark.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/stream/DevNullCounterBenchmark.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/stream/DevNullCounterBenchmark.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/stream/IntegerOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/stream/IntegerOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/stream/IntegerOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/stream/IntegerOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/stream/StreamDuplicaterApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamDuplicaterApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/stream/StreamDuplicaterApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamDuplicaterApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/stream/StreamMergeApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamMergeApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/stream/StreamMergeApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/stream/StreamMergeApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventClassifierApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventClassifierApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventGeneratorApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventGeneratorApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventGeneratorApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventGeneratorApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventIncrementerApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventIncrementerApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/EventIncrementerApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/EventIncrementerApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/FilterClassifierApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilterClassifierApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/FilterClassifierApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilterClassifierApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/FilteredEventClassifierApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/FilteredEventClassifierApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/HashMapOperator.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/HashMapOperator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/HashMapOperator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/HashMapOperator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/RandomEventGeneratorApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/RandomEventGeneratorApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/RandomEventGeneratorApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/RandomEventGeneratorApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/SeedEventGeneratorApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/SeedEventGeneratorApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/SeedEventGeneratorApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/SeedEventGeneratorApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/testbench/ThroughputCounterApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/testbench/ThroughputCounterApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/testbench/ThroughputCounterApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/testbench/ThroughputCounterApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/window/AbstractGenerator.java b/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractGenerator.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/window/AbstractGenerator.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractGenerator.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/window/AbstractWindowedOperatorBenchmarkApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkApp.java
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/window/README.md b/benchmark/src/main/java/org/apache/apex/benchmark/window/README.md
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/window/README.md
rename to benchmark/src/main/java/org/apache/apex/benchmark/window/README.md
diff --git a/benchmark/src/main/java/com/datatorrent/benchmark/window/WindowedOperatorBenchmarkApp.java b/benchmark/src/main/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkApp.java
similarity index 100%
rename from benchmark/src/main/java/com/datatorrent/benchmark/window/WindowedOperatorBenchmarkApp.java
rename to benchmark/src/main/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkApp.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/ApplicationFixedTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/ApplicationFixedTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/ApplicationFixedTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/ApplicationFixedTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/BenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/BenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/BenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/BenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/CouchBaseBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/CouchBaseBenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/CouchBaseBenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/CouchBaseBenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloApp.java b/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloApp.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloApp.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloApp.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/accumulo/AccumuloAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/accumulo/AccumuloAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/aerospike/AerospikeBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/aerospike/AerospikeBenchmarkAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/aerospike/AerospikeBenchmarkAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/aerospike/AerospikeBenchmarkAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/algo/UniqueValueCountBenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/algo/UniqueValueCountBenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/cassandra/CassandraApplicatonTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/cassandra/CassandraApplicatonTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/cassandra/CassandraApplicatonTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/cassandra/CassandraApplicatonTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/hbase/HBaseApplicationTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseApplicationTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/hbase/HBaseApplicationTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseApplicationTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/hbase/HBaseCsvMappingApplication.java b/benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseCsvMappingApplication.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/hbase/HBaseCsvMappingApplication.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/hbase/HBaseCsvMappingApplication.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/hive/HiveInsertBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/hive/HiveInsertBenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveInsertBenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/hive/HiveMapBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveMapBenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/hive/HiveMapBenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/hive/HiveMapBenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/kafka/KafkaInputBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/kafka/KafkaInputBenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaInputBenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/kafka/KafkaOutputBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/kafka/KafkaOutputBenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/kafka/KafkaOutputBenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmark.java b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmark.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmark.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmark.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlInputBenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlInputBenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmark.java b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmark.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmark.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmark.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/memsql/MemsqlOutputBenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/memsql/MemsqlOutputBenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/script/RubyOperatorBenchmarkAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/script/RubyOperatorBenchmarkAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/spillable/SpillableBenchmarkAppTester.java b/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkAppTester.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/spillable/SpillableBenchmarkAppTester.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableBenchmarkAppTester.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/spillable/SpillableDSBenchmarkTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableDSBenchmarkTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/spillable/SpillableDSBenchmarkTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/spillable/SpillableDSBenchmarkTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/state/ManagedStateBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/state/ManagedStateBenchmarkAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/state/ManagedStateBenchmarkAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventClassifierAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventClassifierAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventClassifierNumberToHashDoubleAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventGeneratorAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventGeneratorAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventGeneratorAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventGeneratorAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventIncrementerAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventIncrementerAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/testbench/EventIncrementerAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/testbench/EventIncrementerAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilterClassifierAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilterClassifierAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilterClassifierAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilterClassifierAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilteredEventClassifierAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/testbench/FilteredEventClassifierAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/testbench/FilteredEventClassifierAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/testbench/ThroughputCounterAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/testbench/ThroughputCounterAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/testbench/ThroughputCounterAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/testbench/ThroughputCounterAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/util/serde/GenericSerdePerformanceTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/util/serde/GenericSerdePerformanceTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/util/serde/GenericSerdePerformanceTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/util/serde/GenericSerdePerformanceTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/window/KeyedWindowedOperatorBenchmarkAppTest.java
diff --git a/benchmark/src/test/java/com/datatorrent/benchmark/window/WindowedOperatorBenchmarkAppTest.java b/benchmark/src/test/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkAppTest.java
similarity index 100%
rename from benchmark/src/test/java/com/datatorrent/benchmark/window/WindowedOperatorBenchmarkAppTest.java
rename to benchmark/src/test/java/org/apache/apex/benchmark/window/WindowedOperatorBenchmarkAppTest.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/package-info.java b/contrib/src/main/java/com/datatorrent/contrib/parser/package-info.java
deleted file mode 100644
index cb54b65..0000000
--- a/contrib/src/main/java/com/datatorrent/contrib/parser/package-info.java
+++ /dev/null
@@ -1,20 +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.
- */
-@org.apache.hadoop.classification.InterfaceStability.Evolving
-package com.datatorrent.contrib.parser;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/accumulo/AbstractAccumuloOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AbstractAccumuloOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloWindowStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/accumulo/AccumuloWindowStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/AccumuloWindowStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/accumulo/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/accumulo/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/accumulo/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeGetOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeGetOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeGetOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeNonTransactionalPutOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AbstractAerospikeTransactionalPutOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTransactionalStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/aerospike/AerospikeTransactionalStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTransactionalStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/aerospike/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/aerospike/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/aerospike/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGenerator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/apachelog/ApacheLogInputGenerator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGenerator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLog.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLocalLog.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLog.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGenerator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/apachelog/ApplicationLogGenerator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGenerator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/GeoIPExtractor.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/apachelog/GeoIPExtractor.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/GeoIPExtractor.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/TimestampExtractor.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/apachelog/TimestampExtractor.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/TimestampExtractor.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/UserAgentExtractor.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/apachelog/UserAgentExtractor.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/UserAgentExtractor.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/apachelog/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/apachelog/zmq/Application.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/zmq/Application.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/apachelog/zmq/Application.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/apachelog/zmq/Application.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/avro/AvroFileInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/avro/AvroFileInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/avro/AvroRecordHelper.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroRecordHelper.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/avro/AvroRecordHelper.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroRecordHelper.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/avro/AvroToPojo.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroToPojo.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/avro/AvroToPojo.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/avro/AvroToPojo.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/avro/PojoToAvro.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/avro/PojoToAvro.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/avro/PojoToAvro.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/avro/PojoToAvro.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractCassandraTransactionableOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPOJOOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPOJOOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPojoUtils.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPojoUtils.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPojoUtils.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPojoUtils.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPreparedStatementGenerator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPreparedStatementGenerator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraPreparedStatementGenerator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraPreparedStatementGenerator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraTransactionalStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/CassandraTransactionalStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/CassandraTransactionalStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/ConnectionStateManager.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/ConnectionStateManager.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/ConnectionStateManager.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/ConnectionStateManager.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/UpsertExecutionContext.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/UpsertExecutionContext.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/UpsertExecutionContext.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/UpsertExecutionContext.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/cassandra/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/cassandra/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/cassandra/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/AbstractCouchBaseInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/AbstractCouchBaseInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/AbstractCouchBaseOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/AbstractCouchBaseOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/AbstractCouchBaseSetOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseSetOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/AbstractCouchBaseSetOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/AbstractCouchBaseSetOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseJSONSerializer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseJSONSerializer.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseJSONSerializer.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseJSONSerializer.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBasePOJOInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseSerializer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSerializer.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseSerializer.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSerializer.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseWindowStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseWindowStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchBaseWindowStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseWindowStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchbasePOJOSetOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/CouchbasePOJOSetOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/CouchbasePOJOSetOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchbase/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchbase/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchbase/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractCouchDBOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractCouchDBOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractMapBasedInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchdb/AbstractMapBasedInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/AbstractMapBasedInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDBPOJOOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDbStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchdb/CouchDbStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/CouchDbStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/MapBasedCouchDbOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/MapBasedCouchDbOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchdb/MapBasedCouchDbOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/MapBasedCouchDbOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/couchdb/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/couchdb/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/couchdb/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/AbstractElasticSearchOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchConnectable.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchConnectable.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchConnectable.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchConnectable.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchMapInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchMapInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchMapOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchMapOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchMapOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolatorStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolatorStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/elasticsearch/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/elasticsearch/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/elasticsearch/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/AbstractEnricher.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/AbstractEnricher.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/AbstractEnricher.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/AbstractEnricher.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/BackendLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/BackendLoader.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/BackendLoader.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/BackendLoader.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/DelimitedFSLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/DelimitedFSLoader.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/DelimitedFSLoader.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/DelimitedFSLoader.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/FSLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FSLoader.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/FSLoader.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FSLoader.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/FixedWidthFSLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FixedWidthFSLoader.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/FixedWidthFSLoader.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/FixedWidthFSLoader.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/JDBCLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JDBCLoader.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/JDBCLoader.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JDBCLoader.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/JsonFSLoader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JsonFSLoader.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/JsonFSLoader.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/JsonFSLoader.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/MapEnricher.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/MapEnricher.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/MapEnricher.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/MapEnricher.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/NullValuesCacheManager.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/NullValuesCacheManager.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/NullValuesCacheManager.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/NullValuesCacheManager.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/POJOEnricher.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/POJOEnricher.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/POJOEnricher.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/POJOEnricher.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/enrich/ReadOnlyBackup.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/ReadOnlyBackup.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/enrich/ReadOnlyBackup.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/enrich/ReadOnlyBackup.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/formatter/CsvFormatter.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/formatter/CsvFormatter.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/formatter/CsvFormatter.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/formatter/CsvFormatter.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/geode/AbstractGeodeInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/geode/AbstractGeodeInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/geode/AbstractGeodeOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/geode/AbstractGeodeOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/geode/AbstractGeodeOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/geode/GeodeCheckpointStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/geode/GeodeCheckpointStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/geode/GeodeKeyValueStorageAgent.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgent.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/geode/GeodeKeyValueStorageAgent.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgent.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/geode/GeodePOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/geode/GeodePOJOOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/geode/GeodeStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/geode/GeodeStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/geode/GeodeStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/geode/RegionCreateFunction.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/geode/RegionCreateFunction.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/geode/RegionCreateFunction.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/geode/RegionCreateFunction.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseAppendOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseAppendOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseAppendOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBasePutOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBasePutOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBasePutOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowAppendOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/AbstractHBaseWindowPutOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldInfo.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldInfo.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldInfo.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldInfo.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldValueGenerator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldValueGenerator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseFieldValueGenerator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseFieldValueGenerator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseGetOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseOperatorBase.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseOperatorBase.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseOperatorBase.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseScanOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseWindowStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/HBaseWindowStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/HBaseWindowStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/hbase/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/hbase/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/hbase/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/jython/PythonOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/PythonOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/jython/PythonOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/jython/PythonOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/jython/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/jython/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/jython/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/jython/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractExactlyOnceKafkaOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaSinglePortInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/AbstractKafkaSinglePortInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/HighlevelKafkaConsumer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/HighlevelKafkaConsumer.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/HighlevelKafkaConsumer.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/HighlevelKafkaConsumer.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaConsumer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaConsumer.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaConsumer.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaConsumer.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaJsonEncoder.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaJsonEncoder.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaJsonEncoder.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaJsonEncoder.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaMetadataUtil.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaMetadataUtil.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaMetadataUtil.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaMetadataUtil.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaPartition.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaPartition.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaPartition.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaPartition.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortByteArrayInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaSinglePortByteArrayInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortByteArrayInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaSinglePortByteArrayInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaSinglePortOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaSinglePortOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortStringInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaSinglePortStringInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/KafkaSinglePortStringInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/KafkaSinglePortStringInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/OffsetManager.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/OffsetManager.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/OffsetManager.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/OffsetManager.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/POJOKafkaOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/POJOKafkaOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/POJOKafkaOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/POJOKafkaOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/SimpleKafkaConsumer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/SimpleKafkaConsumer.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/SimpleKafkaConsumer.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/SimpleKafkaConsumer.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kafka/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kafka/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kafka/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/AbstractKinesisInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/AbstractKinesisInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/AbstractKinesisInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/AbstractKinesisInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/AbstractKinesisOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/AbstractKinesisOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/AbstractKinesisOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/AbstractKinesisOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisByteArrayInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisByteArrayInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisByteArrayOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisByteArrayOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisConsumer.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisConsumer.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisConsumer.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisConsumer.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisStringInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisStringInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisStringOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisStringOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisUtil.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisUtil.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/KinesisUtil.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/KinesisUtil.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/ShardManager.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/ShardManager.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/ShardManager.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/ShardManager.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/kinesis/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/kinesis/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/kinesis/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/AbstractMemcacheInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/AbstractMemcacheInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/AbstractMemcacheOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memcache/AbstractMemcacheOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/AbstractMemcacheOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/MemcachePOJOOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memcache/MemcachePOJOOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/MemcachePOJOOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/MemcacheStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/MemcacheStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memcache/MemcacheStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/MemcacheStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memcache/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memcache/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/AbstractMemcacheInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/AbstractMemcacheOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/MemcacheStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/MemcacheStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/MemcacheStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/MemcacheStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memcache_whalin/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memcache_whalin/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/MemsqlPOJOInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/MemsqlPOJOInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/MemsqlPOJOOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlPOJOOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/MemsqlPOJOOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/MemsqlStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memsql/MemsqlStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/MemsqlStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/memsql/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/memsql/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/memsql/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBArrayListOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBArrayListOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBArrayListOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBConnectable.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBConnectable.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBConnectable.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBConnectable.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBHashMapOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBHashMapOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBHashMapOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBPOJOOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mongodb/MongoDBPOJOOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/MongoDBPOJOOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mongodb/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mongodb/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mongodb/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractMqttInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractMqttInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractMqttInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractMqttInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractMqttOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractMqttOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractMqttOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractMqttOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractSinglePortMqttInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractSinglePortMqttInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/AbstractSinglePortMqttOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mqtt/MqttClientConfig.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/MqttClientConfig.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mqtt/MqttClientConfig.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/MqttClientConfig.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/mqtt/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/mqtt/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/mqtt/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/nifi/AbstractNiFiInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/AbstractNiFiInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/nifi/AbstractNiFiInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/AbstractNiFiInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/nifi/AbstractNiFiOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/AbstractNiFiOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/nifi/AbstractNiFiOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/AbstractNiFiOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/nifi/AbstractNiFiSinglePortInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/AbstractNiFiSinglePortInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/nifi/AbstractNiFiSinglePortInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/AbstractNiFiSinglePortInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiDataPacket.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiDataPacket.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiDataPacket.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiDataPacket.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiDataPacketBuilder.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiDataPacketBuilder.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiDataPacketBuilder.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiDataPacketBuilder.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/nifi/StandardNiFiDataPacket.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/StandardNiFiDataPacket.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/nifi/StandardNiFiDataPacket.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/nifi/StandardNiFiDataPacket.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parquet/AbstractParquetFileReader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parquet/AbstractParquetFileReader.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parquet/AbstractParquetFileReader.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parquet/AbstractParquetFileReader.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReader.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parquet/ParquetFilePOJOReader.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReader.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parquet/ParquetFilePOJOReader.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/AbstractCsvParser.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/AbstractCsvParser.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parser/AbstractCsvParser.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parser/AbstractCsvParser.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/CellProcessorBuilder.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/CellProcessorBuilder.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parser/CellProcessorBuilder.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parser/CellProcessorBuilder.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/CsvParser.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/CsvParser.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parser/CsvParser.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parser/CsvParser.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/DelimitedSchema.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/DelimitedSchema.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parser/DelimitedSchema.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parser/DelimitedSchema.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/FixedWidthParser.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/FixedWidthParser.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parser/FixedWidthParser.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parser/FixedWidthParser.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/FixedWidthSchema.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/FixedWidthSchema.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parser/FixedWidthSchema.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parser/FixedWidthSchema.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/JsonParser.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/JsonParser.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parser/JsonParser.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parser/JsonParser.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/RegexParser.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/RegexParser.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parser/RegexParser.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parser/RegexParser.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/parser/Schema.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/Schema.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/parser/Schema.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/parser/Schema.java
diff --git a/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/package-info.java
index 22c2cd4..cb54b65 100644
--- a/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/package-info.java
+++ b/contrib/src/main/java/org/apache/apex/malhar/contrib/parser/package-info.java
@@ -17,4 +17,4 @@
  * under the License.
  */
 @org.apache.hadoop.classification.InterfaceStability.Evolving
-package org.apache.apex.malhar.contrib.parser;
+package com.datatorrent.contrib.parser;
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/REngineConnectable.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/r/REngineConnectable.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/r/REngineConnectable.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/r/REngineConnectable.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/RMax.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/r/RMax.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/r/RMax.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/r/RMax.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/RMin.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/r/RMin.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/r/RMin.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/r/RMin.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/RScript.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/r/RScript.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/r/RScript.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/r/RScript.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/RStandardDeviation.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/r/RStandardDeviation.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/r/RStandardDeviation.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/r/RStandardDeviation.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/r/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/r/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/r/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/r/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractRabbitMQInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractRabbitMQOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractSinglePortRabbitMQInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/AbstractSinglePortRabbitMQOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/rabbitmq/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/rabbitmq/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/rabbitmq/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/AbstractRedisAggregateOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisAggregateOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/AbstractRedisAggregateOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/AbstractRedisInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/AbstractRedisInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/AbstractRedisInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/LettuceStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/LettuceStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/LettuceStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/LettuceStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/NumberSummation.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/NumberSummation.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/NumberSummation.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/NumberSummation.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisKeyValPairOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValPairOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisKeyValPairOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisKeyValueInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/RedisKeyValueInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisKeyValueInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisMapAsValueInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapAsValueInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisMapAsValueInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisMapOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/RedisMapOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisMapOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisNumberSummationKeyValPairOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisNumberSummationMapOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/RedisNumberSummationMapOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisNumberSummationMapOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisPOJOInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisPOJOInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisPOJOOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/RedisPOJOOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisPOJOOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/RedisStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/RedisStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/RedisStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/redis/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/redis/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/redis/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/redis/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/romesyndication/RomeFeedEntry.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/RomeFeedEntry.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/romesyndication/RomeFeedEntry.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/RomeFeedEntry.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/romesyndication/RomeStreamProvider.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/RomeStreamProvider.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/romesyndication/RomeStreamProvider.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/RomeStreamProvider.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/romesyndication/RomeSyndicationOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/RomeSyndicationOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/romesyndication/RomeSyndicationOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/RomeSyndicationOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/romesyndication/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/romesyndication/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/romesyndication/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/ruby/RubyOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/ruby/RubyOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/ruby/RubyOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/ruby/RubyOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/AbstractSolrInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/AbstractSolrInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/AbstractSolrInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/AbstractSolrInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/AbstractSolrOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/AbstractSolrOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/AbstractSolrOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/AbstractSolrOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/CloudSolrServerConnector.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/CloudSolrServerConnector.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/CloudSolrServerConnector.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/CloudSolrServerConnector.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/ConcurrentUpdateSolrServerConnector.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/ConcurrentUpdateSolrServerConnector.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/ConcurrentUpdateSolrServerConnector.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/ConcurrentUpdateSolrServerConnector.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/HttpSolrServerConnector.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/HttpSolrServerConnector.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/HttpSolrServerConnector.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/HttpSolrServerConnector.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/LBHttpSolrServerConnector.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/LBHttpSolrServerConnector.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/LBHttpSolrServerConnector.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/LBHttpSolrServerConnector.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/README.md b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/README.md
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/README.md
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/README.md
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/SolrInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/SolrInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/SolrInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/SolrInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/SolrOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/SolrOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/SolrOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/SolrOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/SolrServerConnector.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/SolrServerConnector.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/SolrServerConnector.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/SolrServerConnector.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/solr/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/solr/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/solr/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/solr/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/AbstractSplunkInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/splunk/AbstractSplunkInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/AbstractSplunkInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarder.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkInputFromForwarder.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarder.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkInputFromForwarder.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkStore.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkStore.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkStore.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkStore.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkTcpOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/SplunkTcpOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/splunk/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/splunk/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/splunk/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/sqlite/SqliteStreamOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/sqlite/SqliteStreamOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/sqlite/SqliteStreamOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/sqlite/SqliteStreamOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/sqlite/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/sqlite/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/sqlite/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/sqlite/package-info.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/twitter/TwitterSampleInput.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/twitter/TwitterSampleInput.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/twitter/TwitterSampleInput.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/twitter/TwitterSampleInput.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractBaseZeroMQInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractBaseZeroMQInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractBaseZeroMQInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractBaseZeroMQInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractBaseZeroMQOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractBaseZeroMQOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractBaseZeroMQOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractBaseZeroMQOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractSinglePortZeroMQInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractSinglePortZeroMQOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/zmq/AbstractSinglePortZeroMQOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/AbstractSinglePortZeroMQOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/SimpleSinglePortZeroMQPullInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/SimpleSinglePortZeroMQPullInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/zmq/SimpleSinglePortZeroMQPullInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/SimpleSinglePortZeroMQPullInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/SimpleSinglePortZeroMQPullStringInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/SimpleSinglePortZeroMQPullStringInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/zmq/SimpleSinglePortZeroMQPullStringInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/SimpleSinglePortZeroMQPullStringInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQInputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/ZeroMQInputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQInputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/ZeroMQInputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperator.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/ZeroMQOutputOperator.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperator.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/ZeroMQOutputOperator.java
diff --git a/contrib/src/main/java/com/datatorrent/contrib/zmq/package-info.java b/contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/package-info.java
similarity index 100%
rename from contrib/src/main/java/com/datatorrent/contrib/zmq/package-info.java
rename to contrib/src/main/java/org/apache/apex/malhar/contrib/zmq/package-info.java
diff --git a/contrib/src/main/resources/com/datatorrent/contrib/apachelog/agents.txt b/contrib/src/main/resources/org/apache/apex/malhar/contrib/apachelog/agents.txt
similarity index 100%
rename from contrib/src/main/resources/com/datatorrent/contrib/apachelog/agents.txt
rename to contrib/src/main/resources/org/apache/apex/malhar/contrib/apachelog/agents.txt
diff --git a/contrib/src/main/resources/com/datatorrent/contrib/apachelog/ipaddress.txt b/contrib/src/main/resources/org/apache/apex/malhar/contrib/apachelog/ipaddress.txt
similarity index 100%
rename from contrib/src/main/resources/com/datatorrent/contrib/apachelog/ipaddress.txt
rename to contrib/src/main/resources/org/apache/apex/malhar/contrib/apachelog/ipaddress.txt
diff --git a/contrib/src/main/resources/com/datatorrent/contrib/apachelog/referers.txt b/contrib/src/main/resources/org/apache/apex/malhar/contrib/apachelog/referers.txt
similarity index 100%
rename from contrib/src/main/resources/com/datatorrent/contrib/apachelog/referers.txt
rename to contrib/src/main/resources/org/apache/apex/malhar/contrib/apachelog/referers.txt
diff --git a/contrib/src/main/resources/com/datatorrent/contrib/apachelog/urls.txt b/contrib/src/main/resources/org/apache/apex/malhar/contrib/apachelog/urls.txt
similarity index 100%
rename from contrib/src/main/resources/com/datatorrent/contrib/apachelog/urls.txt
rename to contrib/src/main/resources/org/apache/apex/malhar/contrib/apachelog/urls.txt
diff --git a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloRowTupleGenerator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloRowTupleGenerator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloRowTupleGenerator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloRowTupleGenerator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloTestHelper.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloTestHelper.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloTestHelper.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloTestHelper.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloTuple.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloTuple.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloTuple.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloTuple.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloTupleCollector.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloTupleCollector.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/accumulo/AccumuloTupleCollector.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/accumulo/AccumuloTupleCollector.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikeOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikeOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikePOJONonTransactionalPutOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJONonTransactionalPutOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikePOJOTransactionalPutOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikePOJOTransactionalPutOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeTestUtils.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTestUtils.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/aerospike/AerospikeTestUtils.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/aerospike/AerospikeTestUtils.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/apachelog/ApacheLogInputGeneratorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGeneratorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/apachelog/ApacheLogInputGeneratorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/ApacheLogInputGeneratorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/apachelog/ApplicationLocalLogTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLogTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/apachelog/ApplicationLocalLogTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLocalLogTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/apachelog/ApplicationLogGeneratorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGeneratorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/apachelog/ApplicationLogGeneratorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/ApplicationLogGeneratorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/apachelog/zmq/ApplicationTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/zmq/ApplicationTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/apachelog/zmq/ApplicationTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/apachelog/zmq/ApplicationTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/avro/AvroFileInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/avro/AvroFileInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/avro/AvroFileInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/avro/AvroToPojoTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/avro/AvroToPojoTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/avro/AvroToPojoTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/avro/AvroToPojoTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/avro/PojoToAvroTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/avro/PojoToAvroTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/avro/PojoToAvroTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/avro/PojoToAvroTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperatorCodecsTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperatorCompositePKTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AbstractUpsertOutputOperatorCountersTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/Address.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/Address.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/Address.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/Address.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/AddressCodec.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AddressCodec.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/AddressCodec.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/AddressCodec.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CassandraLookupCacheBackedOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CassandraOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/CassandraOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CassandraOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CompositePrimaryKeyRow.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CompositePrimaryKeyRow.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/CompositePrimaryKeyRow.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CompositePrimaryKeyRow.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CompositePrimaryKeyUpdateOperator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CompositePrimaryKeyUpdateOperator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/CompositePrimaryKeyUpdateOperator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CompositePrimaryKeyUpdateOperator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CounterColumnTableEntry.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CounterColumnTableEntry.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/CounterColumnTableEntry.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CounterColumnTableEntry.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/CounterColumnUpdatesOperator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CounterColumnUpdatesOperator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/CounterColumnUpdatesOperator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/CounterColumnUpdatesOperator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/FullName.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/FullName.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/FullName.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/FullName.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/FullNameCodec.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/FullNameCodec.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/FullNameCodec.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/FullNameCodec.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/TestInputPojo.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/TestInputPojo.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/TestInputPojo.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/TestInputPojo.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/User.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/User.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/User.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/User.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/cassandra/UserUpsertOperator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/UserUpsertOperator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/cassandra/UserUpsertOperator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/cassandra/UserUpsertOperator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseGetTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseGetTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseGetTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseGetTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBasePOJOTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBasePOJOTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBasePOJOTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseSetTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSetTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchbase/CouchBaseSetTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/CouchBaseSetTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchbase/TestComplexPojoInput.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/TestComplexPojoInput.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchbase/TestComplexPojoInput.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/TestComplexPojoInput.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchbase/TestPojo.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/TestPojo.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchbase/TestPojo.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchbase/TestPojo.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBPOJOInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBPOJOInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBTestHelper.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBTestHelper.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchdb/CouchDBTestHelper.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/CouchDBTestHelper.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/PagedCouchDBInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/PagedCouchDBInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchdb/PagedCouchDBInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/PagedCouchDBInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/couchdb/TestInputPOJO.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/TestInputPOJO.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/couchdb/TestInputPOJO.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/couchdb/TestInputPOJO.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/elasticsearch/ElasticSearchOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/elasticsearch/ElasticSearchOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolateTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolateTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/elasticsearch/ElasticSearchPercolateTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/elasticsearch/ElasticSearchPercolateTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/enrich/EmployeeOrder.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/EmployeeOrder.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/enrich/EmployeeOrder.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/EmployeeOrder.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/enrich/FileEnrichmentTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/FileEnrichmentTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/enrich/FileEnrichmentTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/FileEnrichmentTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/enrich/JDBCLoaderTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/JDBCLoaderTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/enrich/JDBCLoaderTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/JDBCLoaderTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/enrich/MapEnricherTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/MapEnricherTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/enrich/MapEnricherTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/MapEnricherTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/enrich/Order.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/Order.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/enrich/Order.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/Order.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/enrich/POJOEnricherTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/POJOEnricherTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/enrich/POJOEnricherTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/enrich/POJOEnricherTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/formatter/CsvFormatterTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/formatter/CsvFormatterTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/formatter/CsvFormatterTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/formatter/CsvFormatterTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/geode/GeodeCheckpointStoreTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStoreTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/geode/GeodeCheckpointStoreTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeCheckpointStoreTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/geode/GeodeKeyValueStorageAgentTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgentTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/geode/GeodeKeyValueStorageAgentTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeKeyValueStorageAgentTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/geode/GeodeOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/geode/GeodeOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/geode/GeodePOJOOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/geode/GeodePOJOOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodePOJOOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/geode/GeodeStoreTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeStoreTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/geode/GeodeStoreTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/geode/GeodeStoreTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseColTupleGenerator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseColTupleGenerator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseColTupleGenerator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseColTupleGenerator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseCsvMappingPutOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseCsvMappingPutOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseGetOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseGetOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseGetOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseNameValueCsvPutOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBasePOJOPutOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBasePOJOPutOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowStringGenerator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseRowStringGenerator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowStringGenerator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseRowStringGenerator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowTupleGenerator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseRowTupleGenerator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseRowTupleGenerator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseRowTupleGenerator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseScanOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseScanOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseScanOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTestHelper.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTestHelper.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTestHelper.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTestHelper.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalAppendOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTransactionalAppendOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalAppendOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTransactionalAppendOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalPutOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTransactionalPutOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTransactionalPutOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTransactionalPutOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTuple.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTuple.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTuple.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTuple.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTupleCollector.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTupleCollector.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseTupleCollector.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseTupleCollector.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseUtil.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseUtil.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/hbase/HBaseUtil.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/hbase/HBaseUtil.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/helper/CollectorModule.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/helper/CollectorModule.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/helper/CollectorModule.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/helper/CollectorModule.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/helper/MessageQueueTestHelper.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/helper/MessageQueueTestHelper.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/helper/MessageQueueTestHelper.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/helper/MessageQueueTestHelper.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/helper/SourceModule.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/helper/SourceModule.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/helper/SourceModule.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/helper/SourceModule.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/jython/PythonOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/jython/PythonOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/jython/PythonOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/jython/PythonOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaExactlyOnceOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaExactlyOnceOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaExactlyOnceOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaExactlyOnceOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaOperatorTestBase.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaOperatorTestBase.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaOperatorTestBase.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaOperatorTestBase.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaPartitionableInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaPartitionableInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaPartitionableInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaPartitionableInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaSimpleConsumer.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaSimpleConsumer.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaSimpleConsumer.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaSimpleConsumer.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaTestConsumer.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaTestConsumer.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaTestConsumer.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaTestConsumer.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaTestPartitioner.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaTestPartitioner.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaTestPartitioner.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaTestPartitioner.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaTestProducer.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaTestProducer.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/KafkaTestProducer.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/KafkaTestProducer.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/OffsetManagerTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/OffsetManagerTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/OffsetManagerTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/OffsetManagerTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kafka/SimpleKakfaConsumerTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/SimpleKakfaConsumerTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kafka/SimpleKakfaConsumerTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kafka/SimpleKakfaConsumerTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisByteArrayOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisByteArrayOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisByteArrayOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisOperatorTestBase.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisOperatorTestBase.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisOperatorTestBase.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisOperatorTestBase.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisPartitionableInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisPartitionableInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisPartitionableInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisPartitionableInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisStringOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisStringOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisStringOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisTestConsumer.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisTestConsumer.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisTestConsumer.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisTestConsumer.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisTestProducer.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisTestProducer.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kinesis/KinesisTestProducer.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/KinesisTestProducer.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/kinesis/ShardManagerTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/ShardManagerTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/kinesis/ShardManagerTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/kinesis/ShardManagerTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/memcache/MemcacheOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/memcache/MemcacheOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/memcache/MemcacheOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/memcache/MemcacheOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/memcache/MemcachePOJOOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/memcache/MemcachePOJOOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/memcache/MemcachePOJOOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/memcache/MemcachePOJOOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/memcache_whalin/MemcacheWhalinOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/memcache_whalin/MemcacheWhalinOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/memcache_whalin/MemcacheWhalinOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/memcache_whalin/MemcacheWhalinOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/memsql/AbstractMemsqlOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/AbstractMemsqlOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/memsql/MemsqlInputOperator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/MemsqlInputOperator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/memsql/MemsqlInputOperator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/MemsqlInputOperator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/memsql/MemsqlStoreTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/MemsqlStoreTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/memsql/MemsqlStoreTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/MemsqlStoreTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/memsql/TestInputPojo.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/TestInputPojo.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/memsql/TestInputPojo.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/memsql/TestInputPojo.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/mongodb/MongoDBInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/mongodb/MongoDBInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/mongodb/MongoDBOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/mongodb/MongoDBOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/mongodb/MongoDBOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/mongodb/TestPOJO.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/mongodb/TestPOJO.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/mongodb/TestPOJO.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/mongodb/TestPOJO.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/mqtt/MqttInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/mqtt/MqttInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/mqtt/MqttInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/mqtt/MqttInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/mqtt/MqttOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/mqtt/MqttOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/mqtt/MqttOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/mqtt/MqttOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/nifi/NiFiSinglePortOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/NiFiSinglePortOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/nifi/demo/TestNiFiInputApplication.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/demo/TestNiFiInputApplication.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/nifi/demo/TestNiFiInputApplication.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/demo/TestNiFiInputApplication.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/nifi/demo/TestNiFiOutputApplication.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/demo/TestNiFiOutputApplication.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/nifi/demo/TestNiFiOutputApplication.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/demo/TestNiFiOutputApplication.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/nifi/mock/MockDataPacket.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/mock/MockDataPacket.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/nifi/mock/MockDataPacket.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/mock/MockDataPacket.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/nifi/mock/MockSiteToSiteClient.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/mock/MockSiteToSiteClient.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/nifi/mock/MockSiteToSiteClient.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/mock/MockSiteToSiteClient.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/nifi/mock/MockTransaction.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/mock/MockTransaction.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/nifi/mock/MockTransaction.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/nifi/mock/MockTransaction.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReaderTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/parquet/ParquetFilePOJOReaderTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/parquet/ParquetFilePOJOReaderTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/parquet/ParquetFilePOJOReaderTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/parser/CSVParserTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/parser/CSVParserTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/parser/CSVParserTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/parser/CSVParserTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/parser/CsvPOJOParserTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/parser/CsvPOJOParserTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/parser/CsvPOJOParserTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/parser/CsvPOJOParserTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/parser/FixedWidthTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/parser/FixedWidthTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/parser/FixedWidthTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/parser/FixedWidthTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/parser/JsonParserApplicationTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/parser/JsonParserApplicationTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/parser/JsonParserApplicationTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/parser/JsonParserApplicationTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/parser/JsonParserTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/parser/JsonParserTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/parser/JsonParserTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/parser/JsonParserTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/parser/RegexParserTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/parser/RegexParserTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/parser/RegexParserTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/parser/RegexParserTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/r/RMaxOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/r/RMaxOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/r/RMaxOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/r/RMaxOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/r/RMinOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/r/RMinOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/r/RMinOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/r/RMinOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/r/RScriptLinearRegressionPredictorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptLinearRegressionPredictorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/r/RScriptLinearRegressionPredictorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptLinearRegressionPredictorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorBooleanTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorBooleanTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorBooleanTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorBooleanTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorDoubleArrayTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorDoubleArrayTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorDoubleArrayTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorDoubleArrayTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorIntTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorIntTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorIntTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorIntTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorRealTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorRealTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorRealTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorRealTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorStrTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorStrTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/r/RScriptOperatorStrTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/r/RScriptOperatorStrTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/r/RStandardDeviationOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/r/RStandardDeviationOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/r/RStandardDeviationOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/r/RStandardDeviationOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorBenchmark.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQInputOperatorBenchmark.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorBenchmark.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQInputOperatorBenchmark.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorBenchmark.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQOutputOperatorBenchmark.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorBenchmark.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQOutputOperatorBenchmark.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/rabbitmq/RabbitMQOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/rabbitmq/RabbitMQOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/redis/RedisInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/redis/RedisInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/redis/RedisInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/redis/RedisOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/redis/RedisOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/redis/RedisOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/redis/RedisOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/redis/RedisPOJOOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/redis/RedisPOJOOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/redis/RedisPOJOOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/romesyndication/RomeSyndicationOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/romesyndication/RomeSyndicationOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/romesyndication/RomeSyndicationOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/romesyndication/RomeSyndicationOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/ruby/RubyOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/ruby/RubyOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/ruby/RubyOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/ruby/RubyOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarderTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/splunk/SplunkInputFromForwarderTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputFromForwarderTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/splunk/SplunkInputFromForwarderTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/splunk/SplunkInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/splunk/SplunkInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/splunk/SplunkTcpOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/splunk/SplunkTcpOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/splunk/SplunkTcpOutputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/util/FieldValueSerializableGenerator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/util/FieldValueSerializableGenerator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/util/FieldValueSerializableGenerator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/util/FieldValueSerializableGenerator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/util/POJOTupleGenerateOperator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/util/POJOTupleGenerateOperator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/util/POJOTupleGenerateOperator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/util/POJOTupleGenerateOperator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/util/TestPOJO.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/util/TestPOJO.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/util/TestPOJO.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/util/TestPOJO.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/util/TupleCacheOutputOperator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/util/TupleCacheOutputOperator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/util/TupleCacheOutputOperator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/util/TupleCacheOutputOperator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/util/TupleGenerateCacheOperator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/util/TupleGenerateCacheOperator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/util/TupleGenerateCacheOperator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/util/TupleGenerateCacheOperator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/util/TupleGenerator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/util/TupleGenerator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/util/TupleGenerator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/util/TupleGenerator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQInputOperatorBenchmark.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQInputOperatorBenchmark.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQInputOperatorBenchmark.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQInputOperatorBenchmark.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQInputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQInputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQInputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQInputOperatorTest.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQMessageGenerator.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQMessageGenerator.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQMessageGenerator.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQMessageGenerator.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQMessageReceiver.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQMessageReceiver.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQMessageReceiver.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQMessageReceiver.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperatorBenchmark.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQOutputOperatorBenchmark.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperatorBenchmark.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQOutputOperatorBenchmark.java
diff --git a/contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperatorTest.java b/contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQOutputOperatorTest.java
similarity index 100%
rename from contrib/src/test/java/com/datatorrent/contrib/zmq/ZeroMQOutputOperatorTest.java
rename to contrib/src/test/java/org/apache/apex/malhar/contrib/zmq/ZeroMQOutputOperatorTest.java
diff --git a/hive/src/main/java/com/datatorrent/contrib/hive/AbstractFSRollingOutputOperator.java b/hive/src/main/java/org/apache/apex/malhar/hive/AbstractFSRollingOutputOperator.java
similarity index 100%
rename from hive/src/main/java/com/datatorrent/contrib/hive/AbstractFSRollingOutputOperator.java
rename to hive/src/main/java/org/apache/apex/malhar/hive/AbstractFSRollingOutputOperator.java
diff --git a/hive/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java b/hive/src/main/java/org/apache/apex/malhar/hive/FSPojoToHiveOperator.java
similarity index 100%
rename from hive/src/main/java/com/datatorrent/contrib/hive/FSPojoToHiveOperator.java
rename to hive/src/main/java/org/apache/apex/malhar/hive/FSPojoToHiveOperator.java
diff --git a/hive/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java b/hive/src/main/java/org/apache/apex/malhar/hive/HiveOperator.java
similarity index 100%
rename from hive/src/main/java/com/datatorrent/contrib/hive/HiveOperator.java
rename to hive/src/main/java/org/apache/apex/malhar/hive/HiveOperator.java
diff --git a/hive/src/main/java/com/datatorrent/contrib/hive/HiveStore.java b/hive/src/main/java/org/apache/apex/malhar/hive/HiveStore.java
similarity index 100%
rename from hive/src/main/java/com/datatorrent/contrib/hive/HiveStore.java
rename to hive/src/main/java/org/apache/apex/malhar/hive/HiveStore.java
diff --git a/hive/src/main/java/com/datatorrent/contrib/hive/HiveStreamCodec.java b/hive/src/main/java/org/apache/apex/malhar/hive/HiveStreamCodec.java
similarity index 100%
rename from hive/src/main/java/com/datatorrent/contrib/hive/HiveStreamCodec.java
rename to hive/src/main/java/org/apache/apex/malhar/hive/HiveStreamCodec.java
diff --git a/hive/src/main/java/com/datatorrent/contrib/hive/package-info.java b/hive/src/main/java/org/apache/apex/malhar/hive/package-info.java
similarity index 100%
rename from hive/src/main/java/com/datatorrent/contrib/hive/package-info.java
rename to hive/src/main/java/org/apache/apex/malhar/hive/package-info.java
diff --git a/hive/src/test/java/com/datatorrent/contrib/hive/FSRollingMapTestImpl.java b/hive/src/test/java/org/apache/apex/malhar/hive/FSRollingMapTestImpl.java
similarity index 100%
rename from hive/src/test/java/com/datatorrent/contrib/hive/FSRollingMapTestImpl.java
rename to hive/src/test/java/org/apache/apex/malhar/hive/FSRollingMapTestImpl.java
diff --git a/hive/src/test/java/com/datatorrent/contrib/hive/FSRollingTestImpl.java b/hive/src/test/java/org/apache/apex/malhar/hive/FSRollingTestImpl.java
similarity index 100%
rename from hive/src/test/java/com/datatorrent/contrib/hive/FSRollingTestImpl.java
rename to hive/src/test/java/org/apache/apex/malhar/hive/FSRollingTestImpl.java
diff --git a/hive/src/test/java/com/datatorrent/contrib/hive/HiveMockTest.java b/hive/src/test/java/org/apache/apex/malhar/hive/HiveMockTest.java
similarity index 100%
rename from hive/src/test/java/com/datatorrent/contrib/hive/HiveMockTest.java
rename to hive/src/test/java/org/apache/apex/malhar/hive/HiveMockTest.java
diff --git a/hive/src/test/java/com/datatorrent/contrib/hive/HiveStoreTest.java b/hive/src/test/java/org/apache/apex/malhar/hive/HiveStoreTest.java
similarity index 100%
rename from hive/src/test/java/com/datatorrent/contrib/hive/HiveStoreTest.java
rename to hive/src/test/java/org/apache/apex/malhar/hive/HiveStoreTest.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/BottomNMap.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/BottomNMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/BottomNMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/BottomNMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/BottomNUnifier.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/BottomNUnifier.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/BottomNUnifier.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/BottomNUnifier.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/BottomNUniqueMap.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/BottomNUniqueMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/BottomNUniqueMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/BottomNUniqueMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/CompareExceptCountMap.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/CompareExceptCountMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/CompareExceptCountMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/CompareExceptCountMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/Distinct.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/Distinct.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/Distinct.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/Distinct.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/FilterValues.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/FilterValues.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/FilterValues.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/FilterValues.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/InsertSort.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/InsertSort.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/InsertSort.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/InsertSort.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyArrayUnifier.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/LeastFrequentKeyArrayUnifier.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyArrayUnifier.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/LeastFrequentKeyArrayUnifier.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyUnifier.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/LeastFrequentKeyUnifier.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/LeastFrequentKeyUnifier.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/LeastFrequentKeyUnifier.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/LeastFrequentValue.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/LeastFrequentValue.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/LeastFrequentValue.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/LeastFrequentValue.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MatchAllMap.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/MatchAllMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/MatchAllMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/MatchAllMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MatchAnyMap.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/MatchAnyMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/MatchAnyMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/MatchAnyMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MatchMap.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/MatchMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/MatchMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/MatchMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MergeSort.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/MergeSort.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/MergeSort.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/MergeSort.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MergeSortNumber.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/MergeSortNumber.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/MergeSortNumber.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/MergeSortNumber.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/MostFrequentValue.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/MostFrequentValue.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/MostFrequentValue.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/MostFrequentValue.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/TopN.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/TopN.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/TopN.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/TopN.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/TopNUnique.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/TopNUnique.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/TopNUnique.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/TopNUnique.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/UniqueCounter.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/UniqueCounter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/UniqueCounter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/UniqueCounter.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/UniqueValueCount.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/UniqueValueCount.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/UniqueValueCount.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/UniqueValueCount.java
diff --git a/library/src/main/java/com/datatorrent/lib/algo/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/algo/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/algo/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/algo/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/QueueUtils.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/QueueUtils.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/QueueUtils.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/QueueUtils.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/StoreUtils.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/StoreUtils.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/StoreUtils.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/StoreUtils.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlush.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/datastructs/CacheLRUSynchronousFlush.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlush.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/datastructs/CacheLRUSynchronousFlush.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/datastructs/DimensionalTable.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/datastructs/DimensionalTable.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/datastructs/DimensionalTable.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/datastructs/DimensionalTable.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/datastructs/NOPCacheFlushListener.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/datastructs/NOPCacheFlushListener.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/datastructs/NOPCacheFlushListener.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/datastructs/NOPCacheFlushListener.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOByteArrayList.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOByteArrayList.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOByteArrayList.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOByteArrayList.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOGetters.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOGetters.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOGetters.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOGetters.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOMutable.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOMutable.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOMutable.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOMutable.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOType.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOType.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOType.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOType.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOUtils.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOUtils.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/GPOUtils.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/GPOUtils.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/Serde.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/Serde.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/Serde.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/Serde.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptor.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeFieldsDescriptor.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptor.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeFieldsDescriptor.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutable.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListGPOMutable.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutable.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListGPOMutable.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitive.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListPrimitive.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitive.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListPrimitive.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListString.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListString.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeListString.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListString.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeMapPrimitive.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeMapPrimitive.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeMapPrimitive.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeMapPrimitive.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeObjectPayloadFix.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeObjectPayloadFix.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/gpo/SerdeObjectPayloadFix.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeObjectPayloadFix.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/AbstractWindowEndQueueManager.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/AbstractWindowEndQueueManager.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/AppDataWindowEndQueueManager.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/AppDataWindowEndQueueManager.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/AppDataWindowEndQueueManager.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/AppDataWindowEndQueueManager.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryBundle.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryBundle.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/QueryBundle.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryBundle.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryExecutor.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryExecutor.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/QueryExecutor.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryExecutor.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronous.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerAsynchronous.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronous.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerAsynchronous.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronous.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerSynchronous.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronous.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerSynchronous.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueueList.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueueList.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/QueueList.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueueList.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/QueueManager.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueueManager.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/QueueManager.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/QueueManager.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleDoneQueueManager.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/SimpleDoneQueueManager.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/SimpleDoneQueueManager.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/SimpleDoneQueueManager.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/SimpleQueueManager.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/SimpleQueueManager.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/SimpleQueueManager.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/SimpleQueueManager.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/WindowBoundedService.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/WindowBoundedService.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/WindowBoundedService.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/WindowBoundedService.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/WindowEndQueueManager.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/WindowEndQueueManager.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/WindowEndQueueManager.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/WindowEndQueueManager.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageDeserializer.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/CustomMessageDeserializer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageDeserializer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/CustomMessageDeserializer.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageSerializer.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/CustomMessageSerializer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageSerializer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/CustomMessageSerializer.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageValidator.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/CustomMessageValidator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/CustomMessageValidator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/CustomMessageValidator.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/DataQuerySnapshotDeserializer.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/DataQuerySnapshotValidator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataQuerySnapshotValidator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/DataQuerySnapshotValidator.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataResultSnapshotSerializer.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/DataResultSnapshotSerializer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/DataResultSnapshotSerializer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/DataResultSnapshotSerializer.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactory.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageDeserializerFactory.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactory.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageDeserializerFactory.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerInfo.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageDeserializerInfo.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerInfo.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageDeserializerInfo.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerFactory.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageSerializerFactory.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerFactory.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageSerializerFactory.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerInfo.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageSerializerInfo.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageSerializerInfo.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageSerializerInfo.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageType.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageType.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageType.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageType.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageValidatorInfo.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageValidatorInfo.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/MessageValidatorInfo.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageValidatorInfo.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SchemaQueryDeserializer.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SchemaQueryDeserializer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/SchemaQueryDeserializer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SchemaQueryDeserializer.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataDeserializer.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataDeserializer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataDeserializer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataDeserializer.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataSerializer.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataSerializer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataSerializer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataSerializer.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidator.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataValidator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataValidator.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/CustomTimeBucket.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/CustomTimeBucket.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/CustomTimeBucket.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/CustomTimeBucket.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DataQuerySnapshot.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshot.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DataQuerySnapshot.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshot.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DataResultSnapshot.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshot.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DataResultSnapshot.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DimensionalConfigurationSchema.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalConfigurationSchema.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/DimensionalConfigurationSchema.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalConfigurationSchema.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/DimensionalSchema.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalSchema.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/DimensionalSchema.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalSchema.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Fields.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Fields.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/FieldsDescriptor.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/FieldsDescriptor.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/JSONType.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/JSONType.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/JSONType.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/JSONType.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Message.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Message.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/Message.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Message.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/QRBase.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/QRBase.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/QRBase.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/QRBase.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Query.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Query.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/Query.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Query.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Result.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Result.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/Result.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Result.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/ResultFormatter.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/ResultFormatter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/ResultFormatter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/ResultFormatter.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Schema.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Schema.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/Schema.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Schema.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaQuery.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaQuery.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaQuery.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaQuery.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistry.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistry.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistry.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistry.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultiple.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistryMultiple.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultiple.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistryMultiple.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingle.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistrySingle.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingle.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistrySingle.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResult.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaResult.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResult.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaResult.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResultSerializer.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaResultSerializer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaResultSerializer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaResultSerializer.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaUtils.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/SchemaUtils.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaUtils.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SnapshotSchema.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/SnapshotSchema.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/TimeBucket.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/TimeBucket.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/TimeBucket.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/TimeBucket.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Type.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Type.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/schemas/Type.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/schemas/Type.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/snapshot/AbstractAppDataSnapshotServer.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java b/library/src/main/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
rename to library/src/main/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerPOJO.java
diff --git a/library/src/main/java/com/datatorrent/lib/bandwidth/BandwidthLimitingOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/bandwidth/BandwidthLimitingOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/bandwidth/BandwidthLimitingOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/bandwidth/BandwidthLimitingOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/bandwidth/BandwidthManager.java b/library/src/main/java/org/apache/apex/malhar/lib/bandwidth/BandwidthManager.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/bandwidth/BandwidthManager.java
rename to library/src/main/java/org/apache/apex/malhar/lib/bandwidth/BandwidthManager.java
diff --git a/library/src/main/java/com/datatorrent/lib/bandwidth/BandwidthPartitioner.java b/library/src/main/java/org/apache/apex/malhar/lib/bandwidth/BandwidthPartitioner.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/bandwidth/BandwidthPartitioner.java
rename to library/src/main/java/org/apache/apex/malhar/lib/bandwidth/BandwidthPartitioner.java
diff --git a/library/src/main/java/com/datatorrent/lib/codec/JavaSerializationStreamCodec.java b/library/src/main/java/org/apache/apex/malhar/lib/codec/JavaSerializationStreamCodec.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/codec/JavaSerializationStreamCodec.java
rename to library/src/main/java/org/apache/apex/malhar/lib/codec/JavaSerializationStreamCodec.java
diff --git a/library/src/main/java/com/datatorrent/lib/codec/KryoJdkContainer.java b/library/src/main/java/org/apache/apex/malhar/lib/codec/KryoJdkContainer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/codec/KryoJdkContainer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/codec/KryoJdkContainer.java
diff --git a/library/src/main/java/com/datatorrent/lib/codec/KryoSerializableStreamCodec.java b/library/src/main/java/org/apache/apex/malhar/lib/codec/KryoSerializableStreamCodec.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/codec/KryoSerializableStreamCodec.java
rename to library/src/main/java/org/apache/apex/malhar/lib/codec/KryoSerializableStreamCodec.java
diff --git a/library/src/main/java/com/datatorrent/lib/codec/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/codec/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/codec/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/codec/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/converter/ByteArrayToStringConverterOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/converter/ByteArrayToStringConverterOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/converter/ByteArrayToStringConverterOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/converter/ByteArrayToStringConverterOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/converter/Converter.java b/library/src/main/java/org/apache/apex/malhar/lib/converter/Converter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/converter/Converter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/converter/Converter.java
diff --git a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java b/library/src/main/java/org/apache/apex/malhar/lib/converter/MapToKeyHashValuePairConverter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/converter/MapToKeyHashValuePairConverter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/converter/MapToKeyHashValuePairConverter.java
diff --git a/library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java b/library/src/main/java/org/apache/apex/malhar/lib/converter/MapToKeyValuePairConverter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/converter/MapToKeyValuePairConverter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/converter/MapToKeyValuePairConverter.java
diff --git a/library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java b/library/src/main/java/org/apache/apex/malhar/lib/converter/StringValueToNumberConverterForMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/converter/StringValueToNumberConverterForMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/converter/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/converter/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/converter/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/converter/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/counters/BasicCounters.java b/library/src/main/java/org/apache/apex/malhar/lib/counters/BasicCounters.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/counters/BasicCounters.java
rename to library/src/main/java/org/apache/apex/malhar/lib/counters/BasicCounters.java
diff --git a/library/src/main/java/com/datatorrent/lib/counters/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/counters/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/counters/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/counters/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/AbstractAggregateTransactionableKeyValueStoreOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/AbstractAggregateTransactionableStoreOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractBatchTransactionableStoreOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/AbstractBatchTransactionableStoreOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/AbstractBatchTransactionableStoreOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/AbstractBatchTransactionableStoreOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractKeyValueStoreInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/AbstractKeyValueStoreInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/AbstractKeyValueStoreInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/AbstractKeyValueStoreInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/AbstractPassThruTransactionableKeyValueStoreOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/AbstractPassThruTransactionableStoreOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractStoreInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/AbstractStoreInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/AbstractStoreInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/AbstractStoreInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractStoreOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/AbstractStoreOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/AbstractStoreOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/AbstractStoreOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/AbstractTransactionableStoreOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/AbstractTransactionableStoreOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/AbstractTransactionableStoreOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/AbstractTransactionableStoreOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/Connectable.java b/library/src/main/java/org/apache/apex/malhar/lib/db/Connectable.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/Connectable.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/Connectable.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/KeyValueStore.java b/library/src/main/java/org/apache/apex/malhar/lib/db/KeyValueStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/KeyValueStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/KeyValueStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/Transactionable.java b/library/src/main/java/org/apache/apex/malhar/lib/db/Transactionable.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/Transactionable.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/Transactionable.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/TransactionableKeyValueStore.java b/library/src/main/java/org/apache/apex/malhar/lib/db/TransactionableKeyValueStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/TransactionableKeyValueStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/TransactionableKeyValueStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/TransactionableStore.java b/library/src/main/java/org/apache/apex/malhar/lib/db/TransactionableStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/TransactionableStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/TransactionableStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/cache/AbstractDBLookupCacheBackedOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/cache/AbstractDBLookupCacheBackedOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/cache/AbstractDBLookupCacheBackedOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/cache/AbstractDBLookupCacheBackedOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/cache/CacheManager.java b/library/src/main/java/org/apache/apex/malhar/lib/db/cache/CacheManager.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/cache/CacheManager.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/cache/CacheManager.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/cache/CacheStore.java b/library/src/main/java/org/apache/apex/malhar/lib/db/cache/CacheStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/cache/CacheStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/cache/CacheStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/cache/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/db/cache/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/cache/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/cache/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableBatchOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcNonTransactionableBatchOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableBatchOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcNonTransactionableBatchOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcNonTransactionableOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcPOJOOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPollInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcPollInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcPollInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcPollInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/AbstractJdbcTransactionableOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCDimensionalOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JDBCDimensionalOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCDimensionalOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JDBCDimensionalOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JDBCLookupCacheBackedOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JDBCLookupCacheBackedOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcFieldInfo.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcFieldInfo.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcFieldInfo.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcFieldInfo.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalStore.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJOInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJOInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJOInsertOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJONonInsertOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOPollInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJOPollInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPOJOPollInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPOJOPollInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPollInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPollInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcPollInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPollInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcStore.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcTransactionalStore.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcTransactionalStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/JdbcTransactionalStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/JdbcTransactionalStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/jdbc/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/jdbc/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/jdbc/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/db/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/db/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/db/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/db/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/expression/Expression.java b/library/src/main/java/org/apache/apex/malhar/lib/expression/Expression.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/expression/Expression.java
rename to library/src/main/java/org/apache/apex/malhar/lib/expression/Expression.java
diff --git a/library/src/main/java/com/datatorrent/lib/expression/JavaExpressionParser.java b/library/src/main/java/org/apache/apex/malhar/lib/expression/JavaExpressionParser.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/expression/JavaExpressionParser.java
rename to library/src/main/java/org/apache/apex/malhar/lib/expression/JavaExpressionParser.java
diff --git a/library/src/main/java/com/datatorrent/lib/fileaccess/DTFileReader.java b/library/src/main/java/org/apache/apex/malhar/lib/fileaccess/DTFileReader.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/fileaccess/DTFileReader.java
rename to library/src/main/java/org/apache/apex/malhar/lib/fileaccess/DTFileReader.java
diff --git a/library/src/main/java/com/datatorrent/lib/fileaccess/FileAccess.java b/library/src/main/java/org/apache/apex/malhar/lib/fileaccess/FileAccess.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/fileaccess/FileAccess.java
rename to library/src/main/java/org/apache/apex/malhar/lib/fileaccess/FileAccess.java
diff --git a/library/src/main/java/com/datatorrent/lib/fileaccess/FileAccessFSImpl.java b/library/src/main/java/org/apache/apex/malhar/lib/fileaccess/FileAccessFSImpl.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/fileaccess/FileAccessFSImpl.java
rename to library/src/main/java/org/apache/apex/malhar/lib/fileaccess/FileAccessFSImpl.java
diff --git a/library/src/main/java/com/datatorrent/lib/fileaccess/TFileImpl.java b/library/src/main/java/org/apache/apex/malhar/lib/fileaccess/TFileImpl.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/fileaccess/TFileImpl.java
rename to library/src/main/java/org/apache/apex/malhar/lib/fileaccess/TFileImpl.java
diff --git a/library/src/main/java/com/datatorrent/lib/fileaccess/TFileReader.java b/library/src/main/java/org/apache/apex/malhar/lib/fileaccess/TFileReader.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/fileaccess/TFileReader.java
rename to library/src/main/java/org/apache/apex/malhar/lib/fileaccess/TFileReader.java
diff --git a/library/src/main/java/com/datatorrent/lib/fileaccess/TFileWriter.java b/library/src/main/java/org/apache/apex/malhar/lib/fileaccess/TFileWriter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/fileaccess/TFileWriter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/fileaccess/TFileWriter.java
diff --git a/library/src/main/java/com/datatorrent/lib/fileaccess/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/fileaccess/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/fileaccess/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/fileaccess/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/filter/FilterOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/filter/FilterOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/filter/FilterOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/filter/FilterOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/formatter/Formatter.java b/library/src/main/java/org/apache/apex/malhar/lib/formatter/Formatter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/formatter/Formatter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/formatter/Formatter.java
diff --git a/library/src/main/java/com/datatorrent/lib/formatter/JsonFormatter.java b/library/src/main/java/org/apache/apex/malhar/lib/formatter/JsonFormatter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/formatter/JsonFormatter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/formatter/JsonFormatter.java
diff --git a/library/src/main/java/com/datatorrent/lib/formatter/XmlFormatter.java b/library/src/main/java/org/apache/apex/malhar/lib/formatter/XmlFormatter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/formatter/XmlFormatter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/formatter/XmlFormatter.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractFTPInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/AbstractFTPInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/AbstractFTPInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/AbstractFTPInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractHttpGetMultiValuedMapOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpGetMultiValuedMapOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/AbstractHttpGetMultiValuedMapOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpGetMultiValuedMapOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractHttpGetOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpGetOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/AbstractHttpGetOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpGetOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractHttpInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/AbstractHttpInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractHttpOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/AbstractHttpOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/AbstractHttpOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractKeyValueStoreOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/AbstractKeyValueStoreOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/AbstractKeyValueStoreOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/AbstractKeyValueStoreOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/AbstractSocketInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/AbstractSocketInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/AbstractSocketInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/AbstractSocketInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/ApacheGenRandomLogs.java b/library/src/main/java/org/apache/apex/malhar/lib/io/ApacheGenRandomLogs.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/ApacheGenRandomLogs.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/ApacheGenRandomLogs.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/CollectionMultiConsoleOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/CollectionMultiConsoleOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/CollectionMultiConsoleOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/CollectionMultiConsoleOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/ConsoleOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/ConsoleOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/ConsoleOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/ConsoleOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/HttpGetMapOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/HttpGetMapOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/HttpGetMapOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/HttpGetMapOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/HttpJsonChunksInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/HttpJsonChunksInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/HttpJsonChunksInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/HttpJsonChunksInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/HttpLinesInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/HttpLinesInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/HttpLinesInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/HttpLinesInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/HttpOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/HttpOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/HttpOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/HttpOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/HttpPostOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/HttpPostOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/HttpPostOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/HttpPostOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/IdempotentStorageManager.java b/library/src/main/java/org/apache/apex/malhar/lib/io/IdempotentStorageManager.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/IdempotentStorageManager.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/IdempotentStorageManager.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/MapMultiConsoleOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/MapMultiConsoleOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/MapMultiConsoleOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/MapMultiConsoleOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java b/library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataQuery.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQuery.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataQuery.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java b/library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataResult.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResult.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataResult.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/PubSubWebSocketOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/PubSubWebSocketOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/SimpleSinglePortInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/SimpleSinglePortInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/SimpleSinglePortInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/SmtpOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/SmtpOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/SmtpOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/SmtpOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/WebSocketInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/WebSocketInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/WebSocketInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/WebSocketOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/WebSocketOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/WebSocketOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/WebSocketServerInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/WebSocketServerInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/WebSocketServerInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/WebSocketServerInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/WidgetOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/WidgetOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/WidgetOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/WidgetOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/block/AbstractBlockReader.java b/library/src/main/java/org/apache/apex/malhar/lib/io/block/AbstractBlockReader.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/block/AbstractBlockReader.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/block/AbstractBlockReader.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/block/AbstractFSBlockReader.java b/library/src/main/java/org/apache/apex/malhar/lib/io/block/AbstractFSBlockReader.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/block/AbstractFSBlockReader.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/block/AbstractFSBlockReader.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/block/BlockMetadata.java b/library/src/main/java/org/apache/apex/malhar/lib/io/block/BlockMetadata.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/block/BlockMetadata.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/block/BlockMetadata.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/block/BlockWriter.java b/library/src/main/java/org/apache/apex/malhar/lib/io/block/BlockWriter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/block/BlockWriter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/block/BlockWriter.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/block/FSSliceReader.java b/library/src/main/java/org/apache/apex/malhar/lib/io/block/FSSliceReader.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/block/FSSliceReader.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/block/FSSliceReader.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/block/ReaderContext.java b/library/src/main/java/org/apache/apex/malhar/lib/io/block/ReaderContext.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/block/ReaderContext.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/block/ReaderContext.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/block/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/io/block/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/block/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/block/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractFileInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractFileInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractFileOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractFileOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileSplitter.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractFileSplitter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileSplitter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractFileSplitter.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractReconciler.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractReconciler.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/AbstractReconciler.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractReconciler.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractSingleFileOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractSingleFileOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractThroughputFileInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractThroughputFileInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/AbstractThroughputFileInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractThroughputFileInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractWindowFileOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/AbstractWindowFileOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FSInputModule.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/FSInputModule.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/FSInputModule.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/FSInputModule.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FileMerger.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileMerger.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/FileMerger.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileMerger.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitter.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileSplitter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/FileSplitter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileSplitter.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterBase.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileSplitterBase.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterBase.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileSplitterBase.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterInput.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileSplitterInput.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/FileSplitterInput.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileSplitterInput.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FileStitcher.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileStitcher.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/FileStitcher.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/FileStitcher.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FilterStreamCodec.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/FilterStreamCodec.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/FilterStreamCodec.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/FilterStreamCodec.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FilterStreamContext.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/FilterStreamContext.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/FilterStreamContext.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/FilterStreamContext.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/FilterStreamProvider.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/FilterStreamProvider.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/FilterStreamProvider.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/FilterStreamProvider.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/HDFSFileCopyModule.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/HDFSFileCopyModule.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/HDFSFileCopyModule.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/HDFSFileCopyModule.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/HDFSFileMerger.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/HDFSFileMerger.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/HDFSFileMerger.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/HDFSFileMerger.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/S3BlockReader.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/S3BlockReader.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/S3BlockReader.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/S3BlockReader.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/S3InputModule.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/S3InputModule.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/S3InputModule.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/S3InputModule.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/Synchronizer.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/Synchronizer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/Synchronizer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/Synchronizer.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/TailFsInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/TailFsInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/TailFsInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/TailFsInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/io/fs/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/fs/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/fs/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/AbstractJMSInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/AbstractJMSInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/AbstractJMSInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/AbstractJMSInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/AbstractJMSOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/AbstractJMSOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/AbstractJMSOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/AbstractJMSOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/AbstractJMSSinglePortOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/AbstractJMSSinglePortOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/AbstractJMSSinglePortOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/AbstractJMSSinglePortOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/FSPsuedoTransactionableStore.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/FSPsuedoTransactionableStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/FSPsuedoTransactionableStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/FSPsuedoTransactionableStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/JMSBase.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSBase.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/JMSBase.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSBase.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/JMSBaseTransactionableStore.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSBaseTransactionableStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/JMSBaseTransactionableStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSBaseTransactionableStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSMultiPortOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSMultiPortOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/JMSObjectInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSObjectInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/JMSObjectInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSObjectInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/JMSStringInputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSStringInputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/JMSStringInputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSStringInputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/JMSTransactionableStore.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSTransactionableStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/JMSTransactionableStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/JMSTransactionableStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/jms/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/io/jms/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/jms/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/jms/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/io/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/io/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/io/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/io/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/AbstractJoinOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/join/AbstractJoinOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/AbstractJoinOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/AbstractJoinOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/AntiJoinOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/join/AntiJoinOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/AntiJoinOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/AntiJoinOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/Bucket.java b/library/src/main/java/org/apache/apex/malhar/lib/join/Bucket.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/Bucket.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/Bucket.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/InMemoryStore.java b/library/src/main/java/org/apache/apex/malhar/lib/join/InMemoryStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/InMemoryStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/InMemoryStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/JoinStore.java b/library/src/main/java/org/apache/apex/malhar/lib/join/JoinStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/JoinStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/JoinStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/MapJoinOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/join/MapJoinOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/MapJoinOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/MapJoinOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/POJOJoinOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/join/POJOJoinOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/POJOJoinOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/POJOJoinOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/SemiJoinOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/join/SemiJoinOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/SemiJoinOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/SemiJoinOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/TimeBasedStore.java b/library/src/main/java/org/apache/apex/malhar/lib/join/TimeBasedStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/TimeBasedStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/TimeBasedStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/TimeEvent.java b/library/src/main/java/org/apache/apex/malhar/lib/join/TimeEvent.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/TimeEvent.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/TimeEvent.java
diff --git a/library/src/main/java/com/datatorrent/lib/join/TimeEventImpl.java b/library/src/main/java/org/apache/apex/malhar/lib/join/TimeEventImpl.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/join/TimeEventImpl.java
rename to library/src/main/java/org/apache/apex/malhar/lib/join/TimeEventImpl.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/ApacheLogParseMapOutputOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/ApacheLogParseMapOutputOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/ApacheLogParseOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/ApacheLogParseOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/ApacheLogParseOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/ApacheVirtualLogParseOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/ApacheVirtualLogParseOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/ApacheVirtualLogParseOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/ApacheVirtualLogParseOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/DimensionAggregationUnifier.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/DimensionAggregationUnifier.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/DimensionAggregationUnifier.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/DimensionAggregationUnifier.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/DimensionObject.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/DimensionObject.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/DimensionObject.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/DimensionObject.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayList.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenArrayList.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayList.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenArrayList.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMap.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenHashMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenHashMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/FilteredLineTokenizerKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/FilteredLineTokenizerKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/InformationExtractor.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/InformationExtractor.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/InformationExtractor.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/InformationExtractor.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/LineToTokenArrayList.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/LineToTokenArrayList.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/LineToTokenArrayList.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/LineToTokenArrayList.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/LineToTokenHashMap.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/LineToTokenHashMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/LineToTokenHashMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/LineToTokenHashMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/LineTokenizer.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/LineTokenizer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/LineTokenizer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/LineTokenizer.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/LineTokenizerKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/LineTokenizerKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/LineTokenizerKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/LineTokenizerKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregation.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/MultiWindowDimensionAggregation.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregation.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/MultiWindowDimensionAggregation.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/RegexMatchMapOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/RegexMatchMapOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/RegexMatchMapOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/RegexMatchMapOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/logs/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/logs/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/logs/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/logs/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/AbstractAggregateCalc.java b/library/src/main/java/org/apache/apex/malhar/lib/math/AbstractAggregateCalc.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/AbstractAggregateCalc.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/AbstractAggregateCalc.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/AbstractOutput.java b/library/src/main/java/org/apache/apex/malhar/lib/math/AbstractOutput.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/AbstractOutput.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/AbstractOutput.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/AbstractXmlCartesianProduct.java b/library/src/main/java/org/apache/apex/malhar/lib/math/AbstractXmlCartesianProduct.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/AbstractXmlCartesianProduct.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/AbstractXmlCartesianProduct.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/AbstractXmlKeyValueCartesianProduct.java b/library/src/main/java/org/apache/apex/malhar/lib/math/AbstractXmlKeyValueCartesianProduct.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/AbstractXmlKeyValueCartesianProduct.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/AbstractXmlKeyValueCartesianProduct.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/Average.java b/library/src/main/java/org/apache/apex/malhar/lib/math/Average.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/Average.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/Average.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/AverageKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/math/AverageKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/AverageKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/AverageKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/Division.java b/library/src/main/java/org/apache/apex/malhar/lib/math/Division.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/Division.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/Division.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/LogicalCompare.java b/library/src/main/java/org/apache/apex/malhar/lib/math/LogicalCompare.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/LogicalCompare.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/LogicalCompare.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/LogicalCompareToConstant.java b/library/src/main/java/org/apache/apex/malhar/lib/math/LogicalCompareToConstant.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/LogicalCompareToConstant.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/LogicalCompareToConstant.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/Margin.java b/library/src/main/java/org/apache/apex/malhar/lib/math/Margin.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/Margin.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/Margin.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/MarginKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/math/MarginKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/MarginKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/MarginKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/MarginMap.java b/library/src/main/java/org/apache/apex/malhar/lib/math/MarginMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/MarginMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/MarginMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/Max.java b/library/src/main/java/org/apache/apex/malhar/lib/math/Max.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/Max.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/Max.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/MaxKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/math/MaxKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/MaxKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/MaxKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/Min.java b/library/src/main/java/org/apache/apex/malhar/lib/math/Min.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/Min.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/Min.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/MinKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/math/MinKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/MinKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/MinKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/MultiplyByConstant.java b/library/src/main/java/org/apache/apex/malhar/lib/math/MultiplyByConstant.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/MultiplyByConstant.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/MultiplyByConstant.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/Range.java b/library/src/main/java/org/apache/apex/malhar/lib/math/Range.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/Range.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/Range.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/RangeKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/math/RangeKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/RangeKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/RangeKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/RunningAverage.java b/library/src/main/java/org/apache/apex/malhar/lib/math/RunningAverage.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/RunningAverage.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/RunningAverage.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/Sigma.java b/library/src/main/java/org/apache/apex/malhar/lib/math/Sigma.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/Sigma.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/Sigma.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/SingleVariableAbstractCalculus.java b/library/src/main/java/org/apache/apex/malhar/lib/math/SingleVariableAbstractCalculus.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/SingleVariableAbstractCalculus.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/SingleVariableAbstractCalculus.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/SquareCalculus.java b/library/src/main/java/org/apache/apex/malhar/lib/math/SquareCalculus.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/SquareCalculus.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/SquareCalculus.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/Sum.java b/library/src/main/java/org/apache/apex/malhar/lib/math/Sum.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/Sum.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/Sum.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/SumKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/math/SumKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/SumKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/SumKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProduct.java b/library/src/main/java/org/apache/apex/malhar/lib/math/XmlKeyValueStringCartesianProduct.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProduct.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/XmlKeyValueStringCartesianProduct.java
diff --git a/library/src/main/java/com/datatorrent/lib/math/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/math/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/math/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/math/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/AvgAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/AvgAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/AvgAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/AvgAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/max/DoubleMaxAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/max/DoubleMaxAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/max/DoubleMaxAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/max/DoubleMaxAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/max/FloatMaxAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/max/FloatMaxAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/max/FloatMaxAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/max/FloatMaxAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/max/IntMaxAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/max/IntMaxAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/max/IntMaxAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/max/IntMaxAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/max/LongMaxAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/max/LongMaxAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/max/LongMaxAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/max/LongMaxAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/min/DoubleMinAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/min/DoubleMinAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/min/DoubleMinAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/min/DoubleMinAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/min/FloatMinAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/min/FloatMinAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/min/FloatMinAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/min/FloatMinAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/min/IntMinAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/min/IntMinAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/min/IntMinAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/min/IntMinAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/min/LongMinAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/min/LongMinAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/min/LongMinAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/min/LongMinAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/metric/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/metric/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/metric/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/metric/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java b/library/src/main/java/org/apache/apex/malhar/lib/multiwindow/AbstractSlidingWindow.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindow.java
rename to library/src/main/java/org/apache/apex/malhar/lib/multiwindow/AbstractSlidingWindow.java
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/multiwindow/AbstractSlidingWindowKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/multiwindow/AbstractSlidingWindowKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/multiwindow/AbstractSlidingWindowKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowRangeKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowRangeKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowSumKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowSumKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverage.java b/library/src/main/java/org/apache/apex/malhar/lib/multiwindow/SimpleMovingAverage.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverage.java
rename to library/src/main/java/org/apache/apex/malhar/lib/multiwindow/SimpleMovingAverage.java
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageObject.java b/library/src/main/java/org/apache/apex/malhar/lib/multiwindow/SimpleMovingAverageObject.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageObject.java
rename to library/src/main/java/org/apache/apex/malhar/lib/multiwindow/SimpleMovingAverageObject.java
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java b/library/src/main/java/org/apache/apex/malhar/lib/multiwindow/SortedMovingWindow.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/multiwindow/SortedMovingWindow.java
rename to library/src/main/java/org/apache/apex/malhar/lib/multiwindow/SortedMovingWindow.java
diff --git a/library/src/main/java/com/datatorrent/lib/multiwindow/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/multiwindow/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/multiwindow/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/multiwindow/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/parser/Parser.java b/library/src/main/java/org/apache/apex/malhar/lib/parser/Parser.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/parser/Parser.java
rename to library/src/main/java/org/apache/apex/malhar/lib/parser/Parser.java
diff --git a/library/src/main/java/com/datatorrent/lib/parser/XmlParser.java b/library/src/main/java/org/apache/apex/malhar/lib/parser/XmlParser.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/parser/XmlParser.java
rename to library/src/main/java/org/apache/apex/malhar/lib/parser/XmlParser.java
diff --git a/library/src/main/java/com/datatorrent/lib/parser/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/parser/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/parser/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/parser/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/partitioner/StatelessThroughputBasedPartitioner.java b/library/src/main/java/org/apache/apex/malhar/lib/partitioner/StatelessThroughputBasedPartitioner.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/partitioner/StatelessThroughputBasedPartitioner.java
rename to library/src/main/java/org/apache/apex/malhar/lib/partitioner/StatelessThroughputBasedPartitioner.java
diff --git a/library/src/main/java/com/datatorrent/lib/partitioner/StatsAwareStatelessPartitioner.java b/library/src/main/java/org/apache/apex/malhar/lib/partitioner/StatsAwareStatelessPartitioner.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/partitioner/StatsAwareStatelessPartitioner.java
rename to library/src/main/java/org/apache/apex/malhar/lib/partitioner/StatsAwareStatelessPartitioner.java
diff --git a/library/src/main/java/com/datatorrent/lib/partitioner/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/partitioner/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/partitioner/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/partitioner/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/projection/ProjectionOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/projection/ProjectionOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/projection/ProjectionOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/projection/ProjectionOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/script/JavaScriptOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/script/JavaScriptOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/script/JavaScriptOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/script/JavaScriptOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/script/ScriptOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/script/ScriptOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/script/ScriptOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/script/ScriptOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/script/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/script/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/script/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/script/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/statistics/MedianOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/statistics/MedianOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/statistics/MedianOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/statistics/MedianOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/statistics/ModeOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/statistics/ModeOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/statistics/ModeOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/statistics/ModeOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/statistics/StandardDeviation.java b/library/src/main/java/org/apache/apex/malhar/lib/statistics/StandardDeviation.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/statistics/StandardDeviation.java
rename to library/src/main/java/org/apache/apex/malhar/lib/statistics/StandardDeviation.java
diff --git a/library/src/main/java/com/datatorrent/lib/statistics/WeightedMeanOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/statistics/WeightedMeanOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/statistics/WeightedMeanOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/statistics/WeightedMeanOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/statistics/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/statistics/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/statistics/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/statistics/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/AbstractAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/AbstractAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/AbstractAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/AbstractAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/ArrayListAggregator.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/ArrayListAggregator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/ArrayListAggregator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/ArrayListAggregator.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/ArrayListToItem.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/ArrayListToItem.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/ArrayListToItem.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/ConsolidatorKeyVal.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/ConsolidatorKeyVal.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/ConsolidatorKeyVal.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/Counter.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/Counter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/Counter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/Counter.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/DevNull.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/DevNull.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/DevNull.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/DevNull.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/DevNullCounter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/DevNullCounter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/DevNullCounter.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/HashMapToKeyValPair.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/HashMapToKeyValPair.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/HashMapToKeyValPair.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/JsonByteArrayOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/JsonByteArrayOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/JsonByteArrayOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/KeyValPairToHashMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/KeyValPairToHashMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/KeyValPairToHashMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/RoundRobinHashMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/RoundRobinHashMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/RoundRobinHashMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/StreamDuplicater.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/StreamDuplicater.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/StreamDuplicater.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/StreamMerger.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/StreamMerger.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/StreamMerger.java
diff --git a/library/src/main/java/com/datatorrent/lib/stream/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/stream/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/stream/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/stream/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java b/library/src/main/java/org/apache/apex/malhar/lib/streamquery/condition/Condition.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/streamquery/condition/Condition.java
rename to library/src/main/java/org/apache/apex/malhar/lib/streamquery/condition/Condition.java
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java b/library/src/main/java/org/apache/apex/malhar/lib/streamquery/condition/JoinColumnEqualCondition.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/streamquery/condition/JoinColumnEqualCondition.java
rename to library/src/main/java/org/apache/apex/malhar/lib/streamquery/condition/JoinColumnEqualCondition.java
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java b/library/src/main/java/org/apache/apex/malhar/lib/streamquery/index/ColumnIndex.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/streamquery/index/ColumnIndex.java
rename to library/src/main/java/org/apache/apex/malhar/lib/streamquery/index/ColumnIndex.java
diff --git a/library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java b/library/src/main/java/org/apache/apex/malhar/lib/streamquery/index/Index.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/streamquery/index/Index.java
rename to library/src/main/java/org/apache/apex/malhar/lib/streamquery/index/Index.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/ArrayListTestSink.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/ArrayListTestSink.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/ArrayListTestSink.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/CollectorTestSink.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/CollectorTestSink.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/CollectorTestSink.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/CompareFilterTuples.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/CompareFilterTuples.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/CompareFilterTuples.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/CountAndLastTupleTestSink.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/CountAndLastTupleTestSink.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/CountAndLastTupleTestSink.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/CountOccurance.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/CountOccurance.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/CountOccurance.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/CountTestSink.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/CountTestSink.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/CountTestSink.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/EventClassifier.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/EventClassifier.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/EventClassifier.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/EventClassifierNumberToHashDouble.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/EventClassifierNumberToHashDouble.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/EventClassifierNumberToHashDouble.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/EventGenerator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/EventGenerator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/EventGenerator.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/EventIncrementer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/EventIncrementer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/EventIncrementer.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/FilterClassifier.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/FilterClassifier.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/FilterClassifier.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/FilteredEventClassifier.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/FilteredEventClassifier.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/FilteredEventClassifier.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/HashTestSink.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/HashTestSink.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/HashTestSink.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/HttpStatusFilter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/HttpStatusFilter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/HttpStatusFilter.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/KeyValSum.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/KeyValSum.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/KeyValSum.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/RandomEventGenerator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/RandomEventGenerator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/RandomEventGenerator.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/RandomWordGenerator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/RandomWordGenerator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/RandomWordGenerator.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/RedisSumOper.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/RedisSumOper.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/RedisSumOper.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/SeedEventClassifier.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/SeedEventClassifier.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/SeedEventClassifier.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/SeedEventGenerator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/SeedEventGenerator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/SeedEventGenerator.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/SumTestSink.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/SumTestSink.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/SumTestSink.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/ThroughputCounter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/ThroughputCounter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/ThroughputCounter.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/TopOccurrence.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/TopOccurrence.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/TopOccurrence.java
diff --git a/library/src/main/java/com/datatorrent/lib/testbench/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/testbench/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/testbench/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/testbench/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/transform/TransformOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/transform/TransformOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/transform/TransformOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/transform/TransformOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKey.java b/library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseFrequentKey.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKey.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseFrequentKey.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKeyValueMap.java b/library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseFrequentKeyValueMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/AbstractBaseFrequentKeyValueMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseFrequentKeyValueMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractBaseMatchOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseMatchOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/AbstractBaseMatchOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseMatchOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractBaseNNonUniqueOperatorMap.java b/library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseNNonUniqueOperatorMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/AbstractBaseNNonUniqueOperatorMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseNNonUniqueOperatorMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractBaseNOperatorMap.java b/library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseNOperatorMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/AbstractBaseNOperatorMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseNOperatorMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractBaseNUniqueOperatorMap.java b/library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseNUniqueOperatorMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/AbstractBaseNUniqueOperatorMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseNUniqueOperatorMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractBaseSortOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseSortOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/AbstractBaseSortOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/AbstractBaseSortOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractDimensionTimeBucketOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/AbstractDimensionTimeBucketOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/AbstractDimensionTimeBucketOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/AbstractDimensionTimeBucketOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/AbstractKeyValueStorageAgent.java b/library/src/main/java/org/apache/apex/malhar/lib/util/AbstractKeyValueStorageAgent.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/AbstractKeyValueStorageAgent.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/AbstractKeyValueStorageAgent.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/ActiveMQMessageListener.java b/library/src/main/java/org/apache/apex/malhar/lib/util/ActiveMQMessageListener.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/ActiveMQMessageListener.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/ActiveMQMessageListener.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/ActiveMQMultiTypeMessageListener.java b/library/src/main/java/org/apache/apex/malhar/lib/util/ActiveMQMultiTypeMessageListener.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/ActiveMQMultiTypeMessageListener.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/ActiveMQMultiTypeMessageListener.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/ArrayHashMapFrequent.java b/library/src/main/java/org/apache/apex/malhar/lib/util/ArrayHashMapFrequent.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/ArrayHashMapFrequent.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/ArrayHashMapFrequent.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseFilteredKeyValueOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/BaseFilteredKeyValueOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/BaseFilteredKeyValueOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/BaseFilteredKeyValueOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseKeyOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/BaseKeyOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/BaseKeyOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/BaseKeyOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseKeyValueOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/BaseKeyValueOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/BaseKeyValueOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/BaseKeyValueOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java b/library/src/main/java/org/apache/apex/malhar/lib/util/BaseLineTokenizer.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/BaseLineTokenizer.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/BaseLineTokenizer.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/BaseMatchOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/BaseMatchOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/BaseMatchOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseNumberKeyValueOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/BaseNumberKeyValueOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/BaseNumberKeyValueOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/BaseNumberKeyValueOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/BaseNumberValueOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/BaseNumberValueOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/BaseNumberValueOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseUniqueKeyCounter.java b/library/src/main/java/org/apache/apex/malhar/lib/util/BaseUniqueKeyCounter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/BaseUniqueKeyCounter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/BaseUniqueKeyCounter.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/BaseUniqueKeyValueCounter.java b/library/src/main/java/org/apache/apex/malhar/lib/util/BaseUniqueKeyValueCounter.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/BaseUniqueKeyValueCounter.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/BaseUniqueKeyValueCounter.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/DimensionTimeBucketSumOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/DimensionTimeBucketSumOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/FieldInfo.java b/library/src/main/java/org/apache/apex/malhar/lib/util/FieldInfo.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/FieldInfo.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/FieldInfo.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/FieldValueGenerator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/FieldValueGenerator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/FieldValueGenerator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/FieldValueGenerator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/FilterOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/FilterOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/FilterOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/FilterOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/HighLow.java b/library/src/main/java/org/apache/apex/malhar/lib/util/HighLow.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/HighLow.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/HighLow.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/JavaScriptFilterOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/JavaScriptFilterOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/JavaScriptFilterOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/JavaScriptFilterOperator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/KeyHashValPair.java b/library/src/main/java/org/apache/apex/malhar/lib/util/KeyHashValPair.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/KeyHashValPair.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/KeyHashValPair.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/KeyValPair.java b/library/src/main/java/org/apache/apex/malhar/lib/util/KeyValPair.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/KeyValPair.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/KeyValPair.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/KryoCloneUtils.java b/library/src/main/java/org/apache/apex/malhar/lib/util/KryoCloneUtils.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/KryoCloneUtils.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/KryoCloneUtils.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/PojoUtils.java b/library/src/main/java/org/apache/apex/malhar/lib/util/PojoUtils.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/PojoUtils.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/PojoUtils.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/ReusableStringReader.java b/library/src/main/java/org/apache/apex/malhar/lib/util/ReusableStringReader.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/ReusableStringReader.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/ReusableStringReader.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/ReversibleComparator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/ReversibleComparator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/ReversibleComparator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/ReversibleComparator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/StorageAgentKeyValueStore.java b/library/src/main/java/org/apache/apex/malhar/lib/util/StorageAgentKeyValueStore.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/StorageAgentKeyValueStore.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/StorageAgentKeyValueStore.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/TableInfo.java b/library/src/main/java/org/apache/apex/malhar/lib/util/TableInfo.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/TableInfo.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/TableInfo.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/TimeBucketKey.java b/library/src/main/java/org/apache/apex/malhar/lib/util/TimeBucketKey.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/TimeBucketKey.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/TimeBucketKey.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/TopNSort.java b/library/src/main/java/org/apache/apex/malhar/lib/util/TopNSort.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/TopNSort.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/TopNSort.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/TopNUniqueSort.java b/library/src/main/java/org/apache/apex/malhar/lib/util/TopNUniqueSort.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/TopNUniqueSort.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/TopNUniqueSort.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierArrayHashMapFrequent.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierArrayHashMapFrequent.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierArrayHashMapFrequent.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierArrayHashMapFrequent.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierArrayList.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierArrayList.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierArrayList.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierArrayList.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierBooleanAnd.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierBooleanAnd.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierBooleanAnd.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierBooleanAnd.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierBooleanOr.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierBooleanOr.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierBooleanOr.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierBooleanOr.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierCountOccurKey.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierCountOccurKey.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierCountOccurKey.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierCountOccurKey.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierHashMap.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierHashMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierHashMapFrequent.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapFrequent.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierHashMapFrequent.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapFrequent.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierHashMapInteger.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapInteger.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierHashMapInteger.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapInteger.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierHashMapRange.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapRange.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierHashMapRange.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapRange.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierHashMapSumKeys.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapSumKeys.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierHashMapSumKeys.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierHashMapSumKeys.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierKeyValRange.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierKeyValRange.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierKeyValRange.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierKeyValRange.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierMap.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierMap.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierMap.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierMap.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierRange.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierRange.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierRange.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierRange.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/UnifierSumNumber.java b/library/src/main/java/org/apache/apex/malhar/lib/util/UnifierSumNumber.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/UnifierSumNumber.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/UnifierSumNumber.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/comparator/SliceComparator.java b/library/src/main/java/org/apache/apex/malhar/lib/util/comparator/SliceComparator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/comparator/SliceComparator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/comparator/SliceComparator.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/package-info.java b/library/src/main/java/org/apache/apex/malhar/lib/util/package-info.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/package-info.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/package-info.java
diff --git a/library/src/main/java/com/datatorrent/lib/util/time/WindowUtils.java b/library/src/main/java/org/apache/apex/malhar/lib/util/time/WindowUtils.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/util/time/WindowUtils.java
rename to library/src/main/java/org/apache/apex/malhar/lib/util/time/WindowUtils.java
diff --git a/library/src/main/java/com/datatorrent/lib/xml/AbstractXmlDOMOperator.java b/library/src/main/java/org/apache/apex/malhar/lib/xml/AbstractXmlDOMOperator.java
similarity index 100%
rename from library/src/main/java/com/datatorrent/lib/xml/AbstractXmlDOMOperator.java
rename to library/src/main/java/org/apache/apex/malhar/lib/xml/AbstractXmlDOMOperator.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/BottomNMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/BottomNMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/BottomNMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/BottomNMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/BottomNUnifierTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/BottomNUnifierTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/BottomNUnifierTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/BottomNUnifierTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/BottomNUniqueMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/BottomNUniqueMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/BottomNUniqueMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/BottomNUniqueMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/CompareExceptCountMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/CompareExceptCountMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/CompareExceptCountMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/CompareExceptCountMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/DistinctTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/DistinctTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/DistinctTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/DistinctTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/FilterValuesTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/FilterValuesTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/FilterValuesTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/FilterValuesTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/InsertSortTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/InsertSortTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/InsertSortTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/InsertSortTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/LeastFrequentKeyTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/LeastFrequentKeyTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/LeastFrequentKeyTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/LeastFrequentKeyTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/MatchAllMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/MatchAllMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/MatchAllMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/MatchAllMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/MatchAnyMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/MatchAnyMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/MatchAnyMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/MatchAnyMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/MergeSortNumberTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/MergeSortNumberTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/MergeSortNumberTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/MergeSortNumberTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/MostFrequentKeyTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/MostFrequentKeyTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/MostFrequentKeyTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/MostFrequentKeyTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/TopNTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/TopNTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/TopNTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/TopNTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/TopNUniqueTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/TopNUniqueTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/TopNUniqueTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/TopNUniqueTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/UniqueCounterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/UniqueCounterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/UniqueCounterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/UniqueCounterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/algo/UniqueValueCountTest.java b/library/src/test/java/org/apache/apex/malhar/lib/algo/UniqueValueCountTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/algo/UniqueValueCountTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/algo/UniqueValueCountTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/ThreadUtils.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/ThreadUtils.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/ThreadUtils.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/ThreadUtils.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlushTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/datastructs/CacheLRUSynchronousFlushTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/datastructs/CacheLRUSynchronousFlushTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/datastructs/CacheLRUSynchronousFlushTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/datastructs/DimensionalTableTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/datastructs/DimensionalTableTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/datastructs/DimensionalTableTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/datastructs/DimensionalTableTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/dimensions/CustomTimeBucketRegistryTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/dimensions/CustomTimeBucketRegistryTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/dimensions/CustomTimeBucketRegistryTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/dimensions/CustomTimeBucketRegistryTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/dimensions/DimensionsEventTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/dimensions/DimensionsEventTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/dimensions/DimensionsEventTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/dimensions/DimensionsEventTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/gpo/GPOMutableTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/GPOMutableTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/gpo/GPOMutableTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/GPOMutableTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/gpo/GPOUtilsTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/GPOUtilsTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/gpo/GPOUtilsTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/GPOUtilsTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeFieldsDescriptorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeFieldsDescriptorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeFieldsDescriptorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutableTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListGPOMutableTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeListGPOMutableTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListGPOMutableTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitiveTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListPrimitiveTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeListPrimitiveTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListPrimitiveTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeListStringTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListStringTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/gpo/SerdeListStringTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/gpo/SerdeListStringTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/MockQuery.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/MockQuery.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/MockQuery.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/MockQuery.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/MockResult.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/MockResult.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/MockResult.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/MockResult.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/MockResultSerializer.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/MockResultSerializer.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/MockResultSerializer.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/MockResultSerializer.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronousTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerAsynchronousTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/QueryManagerAsynchronousTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerAsynchronousTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronousTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerSynchronousTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/QueryManagerSynchronousTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/QueryManagerSynchronousTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/QueueUtilsTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/QueueUtilsTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/QueueUtilsTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/QueueUtilsTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/SimpleDoneQueryQueueManagerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/SimpleDoneQueryQueueManagerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/SimpleDoneQueryQueueManagerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/SimpleDoneQueryQueueManagerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/SimpleQueryQueueManagerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/SimpleQueryQueueManagerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/SimpleQueryQueueManagerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/SimpleQueryQueueManagerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/WEQueryQueueManagerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/WEQueryQueueManagerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/WEQueryQueueManagerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/WEQueryQueueManagerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/WindowBoundedServiceTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/WindowBoundedServiceTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/WindowBoundedServiceTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/WindowBoundedServiceTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactoryTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageDeserializerFactoryTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/serde/MessageDeserializerFactoryTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/serde/MessageDeserializerFactoryTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataValidatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/query/serde/SimpleDataValidatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/query/serde/SimpleDataValidatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/CustomTimeBucketTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/CustomTimeBucketTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/CustomTimeBucketTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/CustomTimeBucketTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshotDeserializerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DataQuerySnapshotDeserializerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshotDeserializerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DataQuerySnapshotDeserializerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshotTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DataQuerySnapshotTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/DataQuerySnapshotTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DataQuerySnapshotTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshotSerializerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DataResultSnapshotSerializerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/DataResultSnapshotSerializerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DataResultSnapshotSerializerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/DimensionalConfigurationSchemaTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalConfigurationSchemaTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/DimensionalConfigurationSchemaTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalConfigurationSchemaTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/DimensionalSchemaTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalSchemaTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/DimensionalSchemaTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/DimensionalSchemaTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/FieldsDescriptorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/FieldsDescriptorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/ResultFormatterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/ResultFormatterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/ResultFormatterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/ResultFormatterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaQueryTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaQueryTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaQueryTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaQueryTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultipleTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistryMultipleTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaRegistryMultipleTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistryMultipleTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingleTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistrySingleTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaRegistrySingleTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaRegistrySingleTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaTestUtils.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaTestUtils.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaTestUtils.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaTestUtils.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaUtilsTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaUtilsTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/SchemaUtilsTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SchemaUtilsTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/SnapshotSchemaTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SnapshotSchemaTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/SnapshotSchemaTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/SnapshotSchemaTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/schemas/TimeBucketTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/TimeBucketTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/schemas/TimeBucketTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/schemas/TimeBucketTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPojoTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerPojoTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerPojoTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerPojoTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerTagsSupportTest.java b/library/src/test/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerTagsSupportTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/appdata/snapshot/AppDataSnapshotServerTagsSupportTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/appdata/snapshot/AppDataSnapshotServerTagsSupportTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthManagerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/bandwidth/BandwidthManagerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthManagerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/bandwidth/BandwidthManagerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthPartitionerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/bandwidth/BandwidthPartitionerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/bandwidth/BandwidthPartitionerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/bandwidth/BandwidthPartitionerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/codec/JavaSerializationStreamCodecTest.java b/library/src/test/java/org/apache/apex/malhar/lib/codec/JavaSerializationStreamCodecTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/codec/JavaSerializationStreamCodecTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/codec/JavaSerializationStreamCodecTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/codec/KryoStreamCodecTest.java b/library/src/test/java/org/apache/apex/malhar/lib/codec/KryoStreamCodecTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/codec/KryoStreamCodecTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/codec/KryoStreamCodecTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/converter/ByteArrayToStringConverterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/converter/ByteArrayToStringConverterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/converter/ByteArrayToStringConverterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/converter/ByteArrayToStringConverterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/converter/MapToKeyValuePairConverterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/converter/MapToKeyValuePairConverterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/converter/MapToKeyValuePairConverterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/converter/MapToKeyValuePairConverterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/converter/StringValueToNumberConverterForMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/converter/StringValueToNumberConverterForMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/converter/StringValueToNumberConverterForMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/counters/BasicCountersTest.java b/library/src/test/java/org/apache/apex/malhar/lib/counters/BasicCountersTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/counters/BasicCountersTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/counters/BasicCountersTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/KeyValueStoreOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/KeyValueStoreOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/KeyValueStoreOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/KeyValueStoreOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/TransactionableKeyValueStoreOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/TransactionableKeyValueStoreOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/TransactionableKeyValueStoreOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/TransactionableKeyValueStoreOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/cache/CacheManagerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/cache/CacheManagerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/cache/CacheManagerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/cache/CacheManagerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/cache/CacheStoreTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/cache/CacheStoreTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/cache/CacheStoreTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/cache/CacheStoreTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JDBCLookupCacheBackedOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOApp.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcIOApp.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOApp.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcIOApp.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcIOAppTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcIOAppTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcInputOperatorApplicationTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcInputOperatorApplicationTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcInputOperatorApplicationTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcInputOperatorApplicationTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalBatchOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalStoreTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalStoreTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcNonTransactionalStoreTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcNonTransactionalStoreTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorApplicationTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPojoOperatorApplicationTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorApplicationTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPojoOperatorApplicationTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPojoOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPojoOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcPojoPollableOpeartorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcStoreTest.java b/library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcStoreTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcStoreTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/db/jdbc/JdbcStoreTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/filter/FilterAppTest.java b/library/src/test/java/org/apache/apex/malhar/lib/filter/FilterAppTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/filter/FilterAppTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/filter/FilterAppTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/filter/FilterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/filter/FilterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/filter/FilterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/filter/FilterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/formatter/JsonFormatterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/formatter/JsonFormatterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/formatter/JsonFormatterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/formatter/JsonFormatterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/formatter/XmlFormatterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/formatter/XmlFormatterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/formatter/XmlFormatterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/formatter/XmlFormatterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java b/library/src/test/java/org/apache/apex/malhar/lib/helper/OperatorContextTestHelper.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/helper/OperatorContextTestHelper.java
rename to library/src/test/java/org/apache/apex/malhar/lib/helper/OperatorContextTestHelper.java
diff --git a/library/src/test/java/com/datatorrent/lib/helper/SamplePubSubWebSocketServlet.java b/library/src/test/java/org/apache/apex/malhar/lib/helper/SamplePubSubWebSocketServlet.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/helper/SamplePubSubWebSocketServlet.java
rename to library/src/test/java/org/apache/apex/malhar/lib/helper/SamplePubSubWebSocketServlet.java
diff --git a/library/src/test/java/com/datatorrent/lib/helper/TestPortContext.java b/library/src/test/java/org/apache/apex/malhar/lib/helper/TestPortContext.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/helper/TestPortContext.java
rename to library/src/test/java/org/apache/apex/malhar/lib/helper/TestPortContext.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/ApacheRandomLogsTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/ApacheRandomLogsTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/ApacheRandomLogsTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/ApacheRandomLogsTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/FTPStringInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/FTPStringInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/FTPStringInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/HttpGetMapOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/HttpGetMapOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/HttpGetMapOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/HttpGetMapOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/HttpJsonChunksInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/HttpJsonChunksInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/HttpJsonChunksInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/HttpLinesInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/HttpLinesInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/HttpLinesInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/HttpMultiValuedMapGetOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/HttpMultiValuedMapGetOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/HttpMultiValuedMapGetOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/HttpMultiValuedMapGetOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/HttpPostOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/HttpPostOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/HttpPostOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/HttpPostOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/IdempotentStorageManagerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/IdempotentStorageManagerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/IdempotentStorageManagerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/IdempotentStorageManagerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataQueryTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataQueryTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataQueryTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResultTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataResultTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketAppDataResultTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketAppDataResultTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/PubSubWebSocketOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/PubSubWebSocketOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/SmtpOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/SmtpOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/SmtpOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/SmtpOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/SocketInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/SocketInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/SocketInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/SocketInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/WebSocketServerInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/WebSocketServerInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/WebSocketServerInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/WebSocketServerInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/block/AbstractBlockReaderTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/block/AbstractBlockReaderTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/block/AbstractBlockReaderTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/block/AbstractBlockReaderTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/block/FSLineReaderTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/block/FSLineReaderTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/block/FSLineReaderTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/block/FSLineReaderTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/block/FSSliceReaderTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/block/FSSliceReaderTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/block/FSSliceReaderTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/block/FSSliceReaderTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/block/ReadAheadLineReaderTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/block/ReadAheadLineReaderTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/block/ReadAheadLineReaderTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/block/ReadAheadLineReaderTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractFileInputOperatorFailureHandlingTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractFileInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractFileInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractFileOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractFileOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractReconcilerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractReconcilerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/AbstractReconcilerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractReconcilerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractSingleFileOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/AbstractSingleFileOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractSingleFileOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractThroughputFileInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractThroughputFileInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/AbstractThroughputFileInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractThroughputFileInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractWindowFileOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/AbstractWindowFileOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/AbstractWindowFileOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/BlockWriterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/BlockWriterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/BlockWriterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/BlockWriterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FSInputModuleAppTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/FSInputModuleAppTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/FSInputModuleAppTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/FSInputModuleAppTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FSInputModuleTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/FSInputModuleTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/FSInputModuleTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/FSInputModuleTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FastMergerDecisionMakerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/FastMergerDecisionMakerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/FastMergerDecisionMakerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/FastMergerDecisionMakerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileMergerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileMergerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/FileMergerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileMergerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileSplitterBaseTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterBaseTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileSplitterBaseTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileSplitterInputTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterInputTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileSplitterInputTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileSplitterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/FileSplitterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileSplitterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/FileStitcherTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileStitcherTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/FileStitcherTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/FileStitcherTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/S3InputModuleAppTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/S3InputModuleAppTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/S3InputModuleAppTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/S3InputModuleAppTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/SynchronizerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/SynchronizerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/SynchronizerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/SynchronizerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/fs/TailFsInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/fs/TailFsInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/fs/TailFsInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/fs/TailFsInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/FSPsuedoTransactionableStoreTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/FSPsuedoTransactionableStoreTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/FSPsuedoTransactionableStoreTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/FSPsuedoTransactionableStoreTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSMultiPortOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/JMSMultiPortOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSMultiPortOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSObjectInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSObjectInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/JMSObjectInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSObjectInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/JMSOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSStringInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/JMSStringInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSStringInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSTestBase.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSTestBase.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/JMSTestBase.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSTestBase.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSTransactionableStoreTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSTransactionableStoreTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTestBase.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSTransactionableStoreTestBase.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/JMSTransactionableStoreTestBase.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/JMSTransactionableStoreTestBase.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/SQSStringInputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/SQSStringInputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/SQSStringInputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/SQSStringInputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/io/jms/SQSTestBase.java b/library/src/test/java/org/apache/apex/malhar/lib/io/jms/SQSTestBase.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/io/jms/SQSTestBase.java
rename to library/src/test/java/org/apache/apex/malhar/lib/io/jms/SQSTestBase.java
diff --git a/library/src/test/java/com/datatorrent/lib/join/AntiJoinOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/join/AntiJoinOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/join/AntiJoinOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/join/AntiJoinOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/join/MapTimeBasedJoinOperator.java b/library/src/test/java/org/apache/apex/malhar/lib/join/MapTimeBasedJoinOperator.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/join/MapTimeBasedJoinOperator.java
rename to library/src/test/java/org/apache/apex/malhar/lib/join/MapTimeBasedJoinOperator.java
diff --git a/library/src/test/java/com/datatorrent/lib/join/POJOTimeBasedJoinOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/join/POJOTimeBasedJoinOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/join/POJOTimeBasedJoinOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/join/POJOTimeBasedJoinOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/join/SemiJoinOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/join/SemiJoinOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/join/SemiJoinOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/join/SemiJoinOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/ApacheLogParseMapOutputOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/ApacheLogParseMapOutputOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/ApacheLogParseMapOutputOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/ApacheLogParseOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/ApacheLogParseOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/ApacheLogParseOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/ApacheLogParseOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayListTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenArrayListTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/FilteredLineToTokenArrayListTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenArrayListTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenHashMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/FilteredLineToTokenHashMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/FilteredLineToTokenHashMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/FilteredLineTokenizerKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/FilteredLineTokenizerKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/FilteredLineTokenizerKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/LineToTokenArrayListTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/LineToTokenArrayListTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/LineToTokenArrayListTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/LineToTokenArrayListTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/LineToTokenHashMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/LineToTokenHashMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/LineToTokenHashMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/LineToTokenHashMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/LineTokenizerKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/LineTokenizerKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/LineTokenizerKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/LineTokenizerKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/LineTokenizerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/LineTokenizerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/LineTokenizerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/LineTokenizerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregationTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/MultiWindowDimensionAggregationTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/MultiWindowDimensionAggregationTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/MultiWindowDimensionAggregationTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/RegexMatchMapOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/RegexMatchMapOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/RegexMatchMapOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/RegexMatchMapOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/logs/TopNUniqueSiteStatsTest.java b/library/src/test/java/org/apache/apex/malhar/lib/logs/TopNUniqueSiteStatsTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/logs/TopNUniqueSiteStatsTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/logs/TopNUniqueSiteStatsTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/AverageKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/AverageKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/AverageKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/AverageKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/AverageTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/AverageTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/AverageTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/AverageTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/CountOccuranceTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/CountOccuranceTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/CountOccuranceTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/CountOccuranceTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/DivisionTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/DivisionTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/DivisionTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/DivisionTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/LogicalCompareTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/LogicalCompareTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/LogicalCompareTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/LogicalCompareTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/LogicalCompareToConstantTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/LogicalCompareToConstantTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/LogicalCompareToConstantTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/LogicalCompareToConstantTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/MarginKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/MarginKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/MarginKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/MarginKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/MarginMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/MarginMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/MarginMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/MarginMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/MarginTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/MarginTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/MarginTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/MarginTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/MaxKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/MaxKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/MaxKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/MaxKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/MaxTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/MaxTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/MaxTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/MaxTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/MinKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/MinKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/MinKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/MinKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/MinTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/MinTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/MinTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/MinTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/MultiplyByConstantTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/MultiplyByConstantTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/MultiplyByConstantTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/MultiplyByConstantTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/RangeKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/RangeKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/RangeKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/RangeKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/RangeTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/RangeTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/RangeTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/RangeTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/RunningAverageTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/RunningAverageTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/RunningAverageTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/RunningAverageTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/SigmaTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/SigmaTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/SigmaTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/SigmaTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/SquareCalculusTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/SquareCalculusTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/SquareCalculusTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/SquareCalculusTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/SumKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/SumKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/SumKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/SumKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/SumTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/SumTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/SumTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/SumTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProductTest.java b/library/src/test/java/org/apache/apex/malhar/lib/math/XmlKeyValueStringCartesianProductTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/math/XmlKeyValueStringCartesianProductTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/math/XmlKeyValueStringCartesianProductTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowRangeKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/multiwindow/MultiWindowRangeKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowRangeKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowSumKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/multiwindow/MultiWindowSumKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/multiwindow/MultiWindowSumKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageTest.java b/library/src/test/java/org/apache/apex/malhar/lib/multiwindow/SimpleMovingAverageTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/multiwindow/SimpleMovingAverageTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/multiwindow/SimpleMovingAverageTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/multiwindow/SlidingWindowTest.java b/library/src/test/java/org/apache/apex/malhar/lib/multiwindow/SlidingWindowTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/multiwindow/SlidingWindowTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/multiwindow/SlidingWindowTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/multiwindow/SortedMovingWindowTest.java b/library/src/test/java/org/apache/apex/malhar/lib/multiwindow/SortedMovingWindowTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/multiwindow/SortedMovingWindowTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/multiwindow/SortedMovingWindowTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/parser/XmlParserApplicationTest.java b/library/src/test/java/org/apache/apex/malhar/lib/parser/XmlParserApplicationTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/parser/XmlParserApplicationTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/parser/XmlParserApplicationTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/parser/XmlParserTest.java b/library/src/test/java/org/apache/apex/malhar/lib/parser/XmlParserTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/parser/XmlParserTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/parser/XmlParserTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/partitioner/StatelessPartitionerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/partitioner/StatelessPartitionerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/partitioner/StatelessPartitionerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/partitioner/StatelessPartitionerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/partitioner/StatelessThroughputBasedPartitionerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/partitioner/StatelessThroughputBasedPartitionerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/partitioner/StatelessThroughputBasedPartitionerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/partitioner/StatelessThroughputBasedPartitionerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/projection/ActivateTest.java b/library/src/test/java/org/apache/apex/malhar/lib/projection/ActivateTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/projection/ActivateTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/projection/ActivateTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/projection/ProjectionTest.java b/library/src/test/java/org/apache/apex/malhar/lib/projection/ProjectionTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/projection/ProjectionTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/projection/ProjectionTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/script/JavaScriptOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/script/JavaScriptOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/script/JavaScriptOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/script/JavaScriptOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/statistics/MeridianOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/statistics/MeridianOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/statistics/MeridianOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/statistics/MeridianOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/statistics/ModeOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/statistics/ModeOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/statistics/ModeOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/statistics/ModeOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/statistics/StandardDeviationOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/statistics/StandardDeviationOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/statistics/StandardDeviationOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/statistics/StandardDeviationOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/statistics/WeightedMeanOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/statistics/WeightedMeanOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/statistics/WeightedMeanOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/statistics/WeightedMeanOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/ArrayListAggregatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/ArrayListAggregatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/ArrayListAggregatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/ArrayListAggregatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/ArrayListToItemTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/ArrayListToItemTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/ArrayListToItemTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/ArrayListToItemTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/ConsolidatorKeyValTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/ConsolidatorKeyValTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/ConsolidatorKeyValTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/ConsolidatorKeyValTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/CounterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/CounterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/CounterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/CounterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/DevNullCounterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/DevNullCounterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/DevNullCounterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/DevNullCounterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/DevNullTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/DevNullTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/DevNullTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/DevNullTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/HashMapToKeyValPairTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/HashMapToKeyValPairTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/HashMapToKeyValPairTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/HashMapToKeyValPairTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/JsonByteArrayOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/JsonByteArrayOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/JsonByteArrayOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/JsonByteArrayOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/KeyPairToHashMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/KeyPairToHashMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/KeyPairToHashMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/KeyPairToHashMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/RoundRobinHashMapTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/RoundRobinHashMapTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/RoundRobinHashMapTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/RoundRobinHashMapTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/StreamDuplicaterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/StreamDuplicaterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/StreamDuplicaterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/StreamDuplicaterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/stream/StreamMergerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/stream/StreamMergerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/stream/StreamMergerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/stream/StreamMergerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/ActiveMQMessageGenerator.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/ActiveMQMessageGenerator.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/ActiveMQMessageGenerator.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/ActiveMQMessageGenerator.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/EventClassifierTest.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/EventClassifierTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/EventClassifierTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/EventClassifierTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/EventGeneratorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/EventGeneratorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/EventGeneratorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/EventGeneratorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/EventIncrementerTest.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/EventIncrementerTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/EventIncrementerTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/EventIncrementerTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/FilteredEventClassifierTest.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/FilteredEventClassifierTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/FilteredEventClassifierTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/FilteredEventClassifierTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/RandomEventGeneratorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/RandomEventGeneratorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/RandomEventGeneratorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/RandomEventGeneratorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/RandomWordGeneratorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/RandomWordGeneratorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/RandomWordGeneratorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/RandomWordGeneratorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/SeedEventClassifierTest.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/SeedEventClassifierTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/SeedEventClassifierTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/SeedEventClassifierTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/SeedEventGeneratorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/SeedEventGeneratorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/SeedEventGeneratorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/SeedEventGeneratorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/testbench/ThroughputCounterTest.java b/library/src/test/java/org/apache/apex/malhar/lib/testbench/ThroughputCounterTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/testbench/ThroughputCounterTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/testbench/ThroughputCounterTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/transform/TransformOperatorAppTest.java b/library/src/test/java/org/apache/apex/malhar/lib/transform/TransformOperatorAppTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/transform/TransformOperatorAppTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/transform/TransformOperatorAppTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/transform/TransformOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/transform/TransformOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/transform/TransformOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/transform/TransformOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/util/DimensionTimeBucketSumOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/util/DimensionTimeBucketSumOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/util/DimensionTimeBucketSumOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/util/JavaScriptFilterOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/util/JavaScriptFilterOperatorTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/util/JavaScriptFilterOperatorTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/util/JavaScriptFilterOperatorTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/util/KryoCloneUtilsTest.java b/library/src/test/java/org/apache/apex/malhar/lib/util/KryoCloneUtilsTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/util/KryoCloneUtilsTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/util/KryoCloneUtilsTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/util/PojoUtilsTest.java b/library/src/test/java/org/apache/apex/malhar/lib/util/PojoUtilsTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/util/PojoUtilsTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/util/PojoUtilsTest.java
diff --git a/library/src/test/java/com/datatorrent/lib/util/TestObjAllTypes.java b/library/src/test/java/org/apache/apex/malhar/lib/util/TestObjAllTypes.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/util/TestObjAllTypes.java
rename to library/src/test/java/org/apache/apex/malhar/lib/util/TestObjAllTypes.java
diff --git a/library/src/test/java/com/datatorrent/lib/util/TestUtils.java b/library/src/test/java/org/apache/apex/malhar/lib/util/TestUtils.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/util/TestUtils.java
rename to library/src/test/java/org/apache/apex/malhar/lib/util/TestUtils.java
diff --git a/library/src/test/java/com/datatorrent/lib/util/time/WindowUtilsTest.java b/library/src/test/java/org/apache/apex/malhar/lib/util/time/WindowUtilsTest.java
similarity index 100%
rename from library/src/test/java/com/datatorrent/lib/util/time/WindowUtilsTest.java
rename to library/src/test/java/org/apache/apex/malhar/lib/util/time/WindowUtilsTest.java

-- 
To stop receiving notification emails like this one, please contact
"commits@apex.apache.org" <co...@apex.apache.org>.