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