From b3c45b01e69a5328b8d516387f0737b618b1a1af Mon Sep 17 00:00:00 2001
From: nbrendah <brensereko@gmail.com>
Date: Wed, 27 Oct 2021 04:01:47 +0300
Subject: [PATCH] GORA-276: Refactor and organize o.a.g.mapreduce package
 naming

Update pom.xml
---
 .../aerospike/mapreduce/TestAerospikeStoreCountQuery.java   | 2 +-
 .../mapreduce/TestAerospikeStoreMapReduceSerialization.java | 2 +-
 .../aerospike/mapreduce/TestAerospikeStoreWordCount.java    | 2 +-
 .../gora/examples/mapreduce/MapReduceSerialization.java     | 4 ++--
 .../org/apache/gora/examples/mapreduce/QueryCounter.java    | 2 +-
 .../java/org/apache/gora/examples/mapreduce/WordCount.java  | 4 ++--
 .../main/java/org/apache/gora/flink/GoraFlinkEngine.java    | 4 ++--
 .../org/apache/gora/flink/PersistentTypeSerializer.java     | 4 ++--
 .../gora/{mapreduce => io/serializer}/GoraInputFormat.java  | 2 +-
 .../gora/{mapreduce => io/serializer}/GoraInputSplit.java   | 2 +-
 .../{mapreduce => io/serializer}/GoraMapReduceUtils.java    | 2 +-
 .../gora/{mapreduce => io/serializer}/GoraMapper.java       | 2 +-
 .../gora/{mapreduce => io/serializer}/GoraOutputFormat.java | 2 +-
 .../{mapreduce => io/serializer}/GoraRecordCounter.java     | 2 +-
 .../gora/{mapreduce => io/serializer}/GoraRecordReader.java | 2 +-
 .../gora/{mapreduce => io/serializer}/GoraRecordWriter.java | 2 +-
 .../gora/{mapreduce => io/serializer}/GoraReducer.java      | 2 +-
 .../{mapreduce => io/serializer}/NullOutputCommitter.java   | 2 +-
 .../serializer}/PersistentDeserializer.java                 | 2 +-
 .../serializer}/PersistentSerialization.java                | 2 +-
 .../{mapreduce => io/serializer}/PersistentSerializer.java  | 2 +-
 .../gora/{mapreduce => io/serializer}/StringComparator.java | 2 +-
 .../{mapreduce => io/serializer}/StringSerialization.java   | 2 +-
 .../gora/{mapreduce => io/serializer}/package-info.java     | 2 +-
 .../main/java/org/apache/gora/spark/GoraSparkEngine.java    | 6 +++---
 .../org/apache/gora/store/impl/FileBackedDataStoreBase.java | 2 +-
 .../gora/avro/mapreduce/TestDataFileAvroStoreMapReduce.java | 2 +-
 .../serializer}/DataStoreMapReduceTestBase.java             | 2 +-
 .../{mapreduce => io/serializer}/MapReduceTestUtils.java    | 2 +-
 .../{mapreduce => io/serializer}/TestGoraInputFormat.java   | 2 +-
 .../{mapreduce => io/serializer}/TestGoraInputSplit.java    | 2 +-
 .../serializer}/TestPersistentSerialization.java            | 2 +-
 .../gora/{mapreduce => io/serializer}/package-info.java     | 2 +-
 .../src/test/java/org/apache/gora/util/TestIOUtils.java     | 3 +--
 .../mapreduce/ElasticsearchStoreMapReduceTest.java          | 4 ++--
 .../src/main/java/org/apache/gora/goraci/Verify.java        | 2 +-
 .../gora/hbase/mapreduce/TestHBaseStoreCountQuery.java      | 2 +-
 .../mapreduce/TestHBaseStoreMapReduceSerialization.java     | 2 +-
 .../gora/hbase/mapreduce/TestHBaseStoreWordCount.java       | 2 +-
 .../gora/ignite/mapreduce/IgniteStoreMapReduceTest.java     | 2 +-
 .../org/apache/gora/infinispan/store/InfinispanStore.java   | 4 ++--
 .../infinispan/mapreduce/InfinispanStoreMapReduceTest.java  | 2 +-
 .../gora/jcache/mapreduce/JCacheStoreMapReduceTest.java     | 2 +-
 .../apache/gora/kudu/mapreduce/KuduStoreMapReduceTest.java  | 2 +-
 .../gora/mongodb/mapreduce/TestMongoStoreCountQuery.java    | 2 +-
 .../gora/mongodb/mapreduce/TestMongoStoreWordCount.java     | 2 +-
 .../gora/orientdb/mapreduce/OrientDBStoreMapReduceTest.java | 2 +-
 .../gora/orientdb/mapreduce/TestOrientDBStoreWordCount.java | 2 +-
 .../main/java/org/apache/gora/pig/GoraDeleteStorage.java    | 2 +-
 gora-pig/src/main/java/org/apache/gora/pig/GoraStorage.java | 6 +++---
 .../org/apache/gora/pig/mapreduce/PigGoraInputFormat.java   | 4 ++--
 .../org/apache/gora/pig/mapreduce/PigGoraOutputFormat.java  | 4 ++--
 .../gora/redis/mapreduce/RedisStoreMapReduceTest.java       | 2 +-
 .../java/org/apache/gora/tutorial/log/LogAnalytics.java     | 4 ++--
 54 files changed, 67 insertions(+), 68 deletions(-)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/GoraInputFormat.java (99%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/GoraInputSplit.java (98%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/GoraMapReduceUtils.java (98%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/GoraMapper.java (99%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/GoraOutputFormat.java (99%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/GoraRecordCounter.java (97%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/GoraRecordReader.java (99%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/GoraRecordWriter.java (98%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/GoraReducer.java (98%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/NullOutputCommitter.java (97%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/PersistentDeserializer.java (98%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/PersistentSerialization.java (97%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/PersistentSerializer.java (98%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/StringComparator.java (96%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/StringSerialization.java (98%)
 rename gora-core/src/main/java/org/apache/gora/{mapreduce => io/serializer}/package-info.java (95%)
 rename gora-core/src/test/java/org/apache/gora/{mapreduce => io/serializer}/DataStoreMapReduceTestBase.java (98%)
 rename gora-core/src/test/java/org/apache/gora/{mapreduce => io/serializer}/MapReduceTestUtils.java (99%)
 rename gora-core/src/test/java/org/apache/gora/{mapreduce => io/serializer}/TestGoraInputFormat.java (98%)
 rename gora-core/src/test/java/org/apache/gora/{mapreduce => io/serializer}/TestGoraInputSplit.java (98%)
 rename gora-core/src/test/java/org/apache/gora/{mapreduce => io/serializer}/TestPersistentSerialization.java (99%)
 rename gora-core/src/test/java/org/apache/gora/{mapreduce => io/serializer}/package-info.java (95%)

diff --git a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreCountQuery.java b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreCountQuery.java
index f66ce6a22..2136c9caf 100644
--- a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreCountQuery.java
+++ b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreCountQuery.java
@@ -19,7 +19,7 @@
 import org.apache.gora.aerospike.store.AerospikeStartupLogWaitStrategy;
 import org.apache.gora.aerospike.store.AerospikeStore;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.store.DataStoreFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.junit.After;
diff --git a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreMapReduceSerialization.java b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreMapReduceSerialization.java
index 9b9abaed0..6e16d6dca 100644
--- a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreMapReduceSerialization.java
+++ b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreMapReduceSerialization.java
@@ -19,7 +19,7 @@
 import org.apache.gora.aerospike.store.AerospikeStartupLogWaitStrategy;
 import org.apache.gora.aerospike.store.AerospikeStore;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.store.DataStoreFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.junit.After;
diff --git a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreWordCount.java b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreWordCount.java
index 2e4219024..9c1289f6e 100644
--- a/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreWordCount.java
+++ b/gora-aerospike/src/test/java/org/apache/gora/aerospike/mapreduce/TestAerospikeStoreWordCount.java
@@ -20,7 +20,7 @@
 import org.apache.gora.aerospike.store.AerospikeStore;
 import org.apache.gora.examples.generated.TokenDatum;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.store.DataStoreFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.junit.After;
diff --git a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/MapReduceSerialization.java b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/MapReduceSerialization.java
index 6a9990d37..d054765af 100644
--- a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/MapReduceSerialization.java
+++ b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/MapReduceSerialization.java
@@ -21,8 +21,8 @@
 import java.io.IOException;
 
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.GoraMapper;
-import org.apache.gora.mapreduce.GoraReducer;
+import org.apache.gora.io.serializer.GoraMapper;
+import org.apache.gora.io.serializer.GoraReducer;
 import org.apache.gora.query.Query;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.store.DataStoreFactory;
diff --git a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/QueryCounter.java b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/QueryCounter.java
index 9d800e6b8..54f690803 100644
--- a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/QueryCounter.java
+++ b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/QueryCounter.java
@@ -20,7 +20,7 @@
 
 import java.io.IOException;
 
-import org.apache.gora.mapreduce.GoraMapper;
+import org.apache.gora.io.serializer.GoraMapper;
 import org.apache.gora.persistency.Persistent;
 import org.apache.gora.query.Query;
 import org.apache.gora.store.DataStore;
diff --git a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/WordCount.java b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/WordCount.java
index f6ee1735f..f5e0fcf13 100644
--- a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/WordCount.java
+++ b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/WordCount.java
@@ -24,8 +24,8 @@
 
 import org.apache.gora.examples.generated.TokenDatum;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.GoraMapper;
-import org.apache.gora.mapreduce.GoraReducer;
+import org.apache.gora.io.serializer.GoraMapper;
+import org.apache.gora.io.serializer.GoraReducer;
 import org.apache.gora.query.Query;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.store.DataStoreFactory;
diff --git a/gora-core/src/main/java/org/apache/gora/flink/GoraFlinkEngine.java b/gora-core/src/main/java/org/apache/gora/flink/GoraFlinkEngine.java
index 510b28e3a..d1be685bc 100644
--- a/gora-core/src/main/java/org/apache/gora/flink/GoraFlinkEngine.java
+++ b/gora-core/src/main/java/org/apache/gora/flink/GoraFlinkEngine.java
@@ -25,8 +25,8 @@
 import org.apache.flink.api.java.operators.DataSource;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.util.Preconditions;
-import org.apache.gora.mapreduce.GoraInputFormat;
-import org.apache.gora.mapreduce.GoraOutputFormat;
+import org.apache.gora.io.serializer.GoraInputFormat;
+import org.apache.gora.io.serializer.GoraOutputFormat;
 import org.apache.gora.persistency.impl.PersistentBase;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.store.DataStoreFactory;
diff --git a/gora-core/src/main/java/org/apache/gora/flink/PersistentTypeSerializer.java b/gora-core/src/main/java/org/apache/gora/flink/PersistentTypeSerializer.java
index ef554009a..5b1004e34 100644
--- a/gora-core/src/main/java/org/apache/gora/flink/PersistentTypeSerializer.java
+++ b/gora-core/src/main/java/org/apache/gora/flink/PersistentTypeSerializer.java
@@ -24,8 +24,8 @@
 import org.apache.flink.api.java.typeutils.runtime.DataOutputViewStream;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
-import org.apache.gora.mapreduce.PersistentDeserializer;
-import org.apache.gora.mapreduce.PersistentSerializer;
+import org.apache.gora.io.serializer.PersistentDeserializer;
+import org.apache.gora.io.serializer.PersistentSerializer;
 import org.apache.gora.persistency.impl.PersistentBase;
 import org.apache.gora.util.AvroUtils;
 
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputFormat.java b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraInputFormat.java
similarity index 99%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputFormat.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/GoraInputFormat.java
index 637200eeb..8e304b0b6 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputFormat.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraInputFormat.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputSplit.java b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraInputSplit.java
similarity index 98%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputSplit.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/GoraInputSplit.java
index 9a821803e..de2456699 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputSplit.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraInputSplit.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraMapReduceUtils.java
similarity index 98%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/GoraMapReduceUtils.java
index 208d8cd9e..d49339ef8 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapReduceUtils.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraMapReduceUtils.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapper.java b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraMapper.java
similarity index 99%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapper.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/GoraMapper.java
index 7583fe4e9..49cb0c8ac 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapper.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraMapper.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraOutputFormat.java b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraOutputFormat.java
similarity index 99%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/GoraOutputFormat.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/GoraOutputFormat.java
index 9b67de81d..d8c380b3a 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraOutputFormat.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraOutputFormat.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordCounter.java b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraRecordCounter.java
similarity index 97%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordCounter.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/GoraRecordCounter.java
index 30484d049..8e55097fa 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordCounter.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraRecordCounter.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 public class GoraRecordCounter {
   /**
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordReader.java b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraRecordReader.java
similarity index 99%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordReader.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/GoraRecordReader.java
index 0388d7bb0..4f3b3355c 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordReader.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraRecordReader.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordWriter.java b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraRecordWriter.java
similarity index 98%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordWriter.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/GoraRecordWriter.java
index 8a042e8c5..d0f099eb0 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraRecordWriter.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraRecordWriter.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraReducer.java b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraReducer.java
similarity index 98%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/GoraReducer.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/GoraReducer.java
index 2d71fd7ab..926d110bb 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraReducer.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/GoraReducer.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import org.apache.gora.persistency.Persistent;
 import org.apache.gora.store.DataStore;
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/NullOutputCommitter.java b/gora-core/src/main/java/org/apache/gora/io/serializer/NullOutputCommitter.java
similarity index 97%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/NullOutputCommitter.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/NullOutputCommitter.java
index 12951b1e6..9e6563cd4 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/NullOutputCommitter.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/NullOutputCommitter.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/PersistentDeserializer.java b/gora-core/src/main/java/org/apache/gora/io/serializer/PersistentDeserializer.java
similarity index 98%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/PersistentDeserializer.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/PersistentDeserializer.java
index 8a957b91d..810549c59 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/PersistentDeserializer.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/PersistentDeserializer.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/PersistentSerialization.java b/gora-core/src/main/java/org/apache/gora/io/serializer/PersistentSerialization.java
similarity index 97%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/PersistentSerialization.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/PersistentSerialization.java
index 6ee1f4ed3..ea25812cd 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/PersistentSerialization.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/PersistentSerialization.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import org.apache.gora.persistency.impl.PersistentBase;
 import org.apache.hadoop.io.serializer.Deserializer;
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/PersistentSerializer.java b/gora-core/src/main/java/org/apache/gora/io/serializer/PersistentSerializer.java
similarity index 98%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/PersistentSerializer.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/PersistentSerializer.java
index c266b8b91..4182c7dfe 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/PersistentSerializer.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/PersistentSerializer.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/StringComparator.java b/gora-core/src/main/java/org/apache/gora/io/serializer/StringComparator.java
similarity index 96%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/StringComparator.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/StringComparator.java
index a26fde282..4de4588d3 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/StringComparator.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/StringComparator.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import org.apache.hadoop.io.RawComparator;
 import org.apache.hadoop.io.Text;
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/StringSerialization.java b/gora-core/src/main/java/org/apache/gora/io/serializer/StringSerialization.java
similarity index 98%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/StringSerialization.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/StringSerialization.java
index 2af37a807..1f0398240 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/StringSerialization.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/StringSerialization.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/package-info.java b/gora-core/src/main/java/org/apache/gora/io/serializer/package-info.java
similarity index 95%
rename from gora-core/src/main/java/org/apache/gora/mapreduce/package-info.java
rename to gora-core/src/main/java/org/apache/gora/io/serializer/package-info.java
index 2a39934b0..0463d4d50 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/package-info.java
+++ b/gora-core/src/main/java/org/apache/gora/io/serializer/package-info.java
@@ -17,4 +17,4 @@
 /**
  * MapReduce related utilities for Gora.
  */
-package org.apache.gora.mapreduce;
\ No newline at end of file
+package org.apache.gora.io.serializer;
\ No newline at end of file
diff --git a/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java b/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java
index fb3831d19..42cacc4f7 100644
--- a/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java
+++ b/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java
@@ -19,9 +19,9 @@
 
 import java.io.IOException;
 
-import org.apache.gora.mapreduce.GoraInputFormat;
-import org.apache.gora.mapreduce.GoraMapReduceUtils;
-import org.apache.gora.mapreduce.GoraOutputFormat;
+import org.apache.gora.io.serializer.GoraInputFormat;
+import org.apache.gora.io.serializer.GoraMapReduceUtils;
+import org.apache.gora.io.serializer.GoraOutputFormat;
 import org.apache.gora.persistency.Persistent;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.util.IOUtils;
diff --git a/gora-core/src/main/java/org/apache/gora/store/impl/FileBackedDataStoreBase.java b/gora-core/src/main/java/org/apache/gora/store/impl/FileBackedDataStoreBase.java
index 29d35725f..7540859db 100644
--- a/gora-core/src/main/java/org/apache/gora/store/impl/FileBackedDataStoreBase.java
+++ b/gora-core/src/main/java/org/apache/gora/store/impl/FileBackedDataStoreBase.java
@@ -28,7 +28,7 @@
 import java.util.Properties;
 
 import org.apache.gora.avro.store.AvroStore;
-import org.apache.gora.mapreduce.GoraMapReduceUtils;
+import org.apache.gora.io.serializer.GoraMapReduceUtils;
 import org.apache.gora.persistency.impl.PersistentBase;
 import org.apache.gora.query.PartitionQuery;
 import org.apache.gora.query.Query;
diff --git a/gora-core/src/test/java/org/apache/gora/avro/mapreduce/TestDataFileAvroStoreMapReduce.java b/gora-core/src/test/java/org/apache/gora/avro/mapreduce/TestDataFileAvroStoreMapReduce.java
index 2f0aee532..c516ab396 100644
--- a/gora-core/src/test/java/org/apache/gora/avro/mapreduce/TestDataFileAvroStoreMapReduce.java
+++ b/gora-core/src/test/java/org/apache/gora/avro/mapreduce/TestDataFileAvroStoreMapReduce.java
@@ -24,7 +24,7 @@
 
 import org.apache.gora.avro.store.DataFileAvroStore;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.DataStoreMapReduceTestBase;
+import org.apache.gora.io.serializer.DataStoreMapReduceTestBase;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.store.DataStoreFactory;
 
diff --git a/gora-core/src/test/java/org/apache/gora/mapreduce/DataStoreMapReduceTestBase.java b/gora-core/src/test/java/org/apache/gora/io/serializer/DataStoreMapReduceTestBase.java
similarity index 98%
rename from gora-core/src/test/java/org/apache/gora/mapreduce/DataStoreMapReduceTestBase.java
rename to gora-core/src/test/java/org/apache/gora/io/serializer/DataStoreMapReduceTestBase.java
index c3778af78..9486bdfcc 100644
--- a/gora-core/src/test/java/org/apache/gora/mapreduce/DataStoreMapReduceTestBase.java
+++ b/gora-core/src/test/java/org/apache/gora/io/serializer/DataStoreMapReduceTestBase.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 
diff --git a/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java b/gora-core/src/test/java/org/apache/gora/io/serializer/MapReduceTestUtils.java
similarity index 99%
rename from gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java
rename to gora-core/src/test/java/org/apache/gora/io/serializer/MapReduceTestUtils.java
index c0162915e..b5fdbf0f0 100644
--- a/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java
+++ b/gora-core/src/test/java/org/apache/gora/io/serializer/MapReduceTestUtils.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
diff --git a/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java b/gora-core/src/test/java/org/apache/gora/io/serializer/TestGoraInputFormat.java
similarity index 98%
rename from gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java
rename to gora-core/src/test/java/org/apache/gora/io/serializer/TestGoraInputFormat.java
index e6872a948..01224dc87 100644
--- a/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputFormat.java
+++ b/gora-core/src/test/java/org/apache/gora/io/serializer/TestGoraInputFormat.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputSplit.java b/gora-core/src/test/java/org/apache/gora/io/serializer/TestGoraInputSplit.java
similarity index 98%
rename from gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputSplit.java
rename to gora-core/src/test/java/org/apache/gora/io/serializer/TestGoraInputSplit.java
index 5bf505043..38c76d12d 100644
--- a/gora-core/src/test/java/org/apache/gora/mapreduce/TestGoraInputSplit.java
+++ b/gora-core/src/test/java/org/apache/gora/io/serializer/TestGoraInputSplit.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/gora-core/src/test/java/org/apache/gora/mapreduce/TestPersistentSerialization.java b/gora-core/src/test/java/org/apache/gora/io/serializer/TestPersistentSerialization.java
similarity index 99%
rename from gora-core/src/test/java/org/apache/gora/mapreduce/TestPersistentSerialization.java
rename to gora-core/src/test/java/org/apache/gora/io/serializer/TestPersistentSerialization.java
index b2b66abe7..1633ab58b 100644
--- a/gora-core/src/test/java/org/apache/gora/mapreduce/TestPersistentSerialization.java
+++ b/gora-core/src/test/java/org/apache/gora/io/serializer/TestPersistentSerialization.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.gora.mapreduce;
+package org.apache.gora.io.serializer;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/gora-core/src/test/java/org/apache/gora/mapreduce/package-info.java b/gora-core/src/test/java/org/apache/gora/io/serializer/package-info.java
similarity index 95%
rename from gora-core/src/test/java/org/apache/gora/mapreduce/package-info.java
rename to gora-core/src/test/java/org/apache/gora/io/serializer/package-info.java
index cb7184be5..c3b5b9787 100644
--- a/gora-core/src/test/java/org/apache/gora/mapreduce/package-info.java
+++ b/gora-core/src/test/java/org/apache/gora/io/serializer/package-info.java
@@ -17,4 +17,4 @@
 /**
  * This package contains test cases releated mapreduce.
  */
-package org.apache.gora.mapreduce;
\ No newline at end of file
+package org.apache.gora.io.serializer;
\ No newline at end of file
diff --git a/gora-core/src/test/java/org/apache/gora/util/TestIOUtils.java b/gora-core/src/test/java/org/apache/gora/util/TestIOUtils.java
index ec2a791cb..fbe91a9b1 100644
--- a/gora-core/src/test/java/org/apache/gora/util/TestIOUtils.java
+++ b/gora-core/src/test/java/org/apache/gora/util/TestIOUtils.java
@@ -29,9 +29,8 @@
 
 import org.apache.avro.util.ByteBufferInputStream;
 import org.apache.avro.util.ByteBufferOutputStream;
-import org.apache.gora.mapreduce.GoraMapReduceUtils;
+import org.apache.gora.io.serializer.GoraMapReduceUtils;
 import org.apache.gora.persistency.impl.PersistentBase;
-import org.apache.gora.util.IOUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.DataInputBuffer;
 import org.apache.hadoop.io.DataOutputBuffer;
diff --git a/gora-elasticsearch/src/test/java/org/apache/gora/elasticsearch/mapreduce/ElasticsearchStoreMapReduceTest.java b/gora-elasticsearch/src/test/java/org/apache/gora/elasticsearch/mapreduce/ElasticsearchStoreMapReduceTest.java
index c05c4417b..d254ca0c8 100644
--- a/gora-elasticsearch/src/test/java/org/apache/gora/elasticsearch/mapreduce/ElasticsearchStoreMapReduceTest.java
+++ b/gora-elasticsearch/src/test/java/org/apache/gora/elasticsearch/mapreduce/ElasticsearchStoreMapReduceTest.java
@@ -18,8 +18,8 @@
 
 import org.apache.gora.elasticsearch.GoraElasticsearchTestDriver;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.DataStoreMapReduceTestBase;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.DataStoreMapReduceTestBase;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.store.DataStoreFactory;
 import org.junit.After;
diff --git a/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java b/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java
index 8a68767a3..fb9871e01 100644
--- a/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java
+++ b/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java
@@ -31,7 +31,7 @@
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.gora.mapreduce.GoraMapper;
+import org.apache.gora.io.serializer.GoraMapper;
 import org.apache.gora.query.Query;
 import org.apache.gora.query.Result;
 import org.apache.gora.store.DataStore;
diff --git a/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreCountQuery.java b/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreCountQuery.java
index 088f4ad95..c670b158b 100644
--- a/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreCountQuery.java
+++ b/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreCountQuery.java
@@ -21,7 +21,7 @@
 import org.apache.gora.examples.generated.WebPage;
 import org.apache.gora.hbase.store.HBaseStore;
 import org.apache.gora.hbase.util.HBaseClusterSingleton;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.store.DataStoreFactory;
 
 import org.junit.After;
diff --git a/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreMapReduceSerialization.java b/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreMapReduceSerialization.java
index f73c77b6a..e4ca67586 100644
--- a/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreMapReduceSerialization.java
+++ b/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreMapReduceSerialization.java
@@ -21,7 +21,7 @@
 import org.apache.gora.examples.generated.WebPage;
 import org.apache.gora.hbase.store.HBaseStore;
 import org.apache.gora.hbase.util.HBaseClusterSingleton;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.store.DataStoreFactory;
 import org.junit.After;
 import org.junit.Before;
diff --git a/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreWordCount.java b/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreWordCount.java
index e8ee1598f..4c1c67e84 100644
--- a/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreWordCount.java
+++ b/gora-hbase/src/test/java/org/apache/gora/hbase/mapreduce/TestHBaseStoreWordCount.java
@@ -22,7 +22,7 @@
 import org.apache.gora.examples.generated.WebPage;
 import org.apache.gora.hbase.store.HBaseStore;
 import org.apache.gora.hbase.util.HBaseClusterSingleton;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.store.DataStoreFactory;
 
 import org.junit.After;
diff --git a/gora-ignite/src/test/java/org/apache/gora/ignite/mapreduce/IgniteStoreMapReduceTest.java b/gora-ignite/src/test/java/org/apache/gora/ignite/mapreduce/IgniteStoreMapReduceTest.java
index 2f82247e3..e58b45f2e 100644
--- a/gora-ignite/src/test/java/org/apache/gora/ignite/mapreduce/IgniteStoreMapReduceTest.java
+++ b/gora-ignite/src/test/java/org/apache/gora/ignite/mapreduce/IgniteStoreMapReduceTest.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import org.apache.gora.examples.generated.WebPage;
 import org.apache.gora.ignite.GoraIgniteTestDriver;
-import org.apache.gora.mapreduce.DataStoreMapReduceTestBase;
+import org.apache.gora.io.serializer.DataStoreMapReduceTestBase;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.store.DataStoreFactory;
 import org.junit.After;
diff --git a/gora-infinispan/src/main/java/org/apache/gora/infinispan/store/InfinispanStore.java b/gora-infinispan/src/main/java/org/apache/gora/infinispan/store/InfinispanStore.java
index fa3df2206..e0436caa5 100644
--- a/gora-infinispan/src/main/java/org/apache/gora/infinispan/store/InfinispanStore.java
+++ b/gora-infinispan/src/main/java/org/apache/gora/infinispan/store/InfinispanStore.java
@@ -17,8 +17,8 @@
  */
 package org.apache.gora.infinispan.store;
 
-import static org.apache.gora.mapreduce.GoraRecordReader.BUFFER_LIMIT_READ_NAME;
-import static org.apache.gora.mapreduce.GoraRecordReader.BUFFER_LIMIT_READ_VALUE;
+import static org.apache.gora.io.serializer.GoraRecordReader.BUFFER_LIMIT_READ_NAME;
+import static org.apache.gora.io.serializer.GoraRecordReader.BUFFER_LIMIT_READ_VALUE;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/gora-infinispan/src/test/java/org/apache/gora/infinispan/mapreduce/InfinispanStoreMapReduceTest.java b/gora-infinispan/src/test/java/org/apache/gora/infinispan/mapreduce/InfinispanStoreMapReduceTest.java
index 19e3a5379..011aad498 100644
--- a/gora-infinispan/src/test/java/org/apache/gora/infinispan/mapreduce/InfinispanStoreMapReduceTest.java
+++ b/gora-infinispan/src/test/java/org/apache/gora/infinispan/mapreduce/InfinispanStoreMapReduceTest.java
@@ -20,7 +20,7 @@
 import org.apache.gora.examples.generated.WebPage;
 import org.apache.gora.infinispan.GoraInfinispanTestDriver;
 import org.apache.gora.infinispan.store.InfinispanStore;
-import org.apache.gora.mapreduce.DataStoreMapReduceTestBase;
+import org.apache.gora.io.serializer.DataStoreMapReduceTestBase;
 import org.apache.gora.store.DataStore;
 import org.apache.hadoop.conf.Configuration;
 import org.junit.After;
diff --git a/gora-jcache/src/test/java/org/apache/gora/jcache/mapreduce/JCacheStoreMapReduceTest.java b/gora-jcache/src/test/java/org/apache/gora/jcache/mapreduce/JCacheStoreMapReduceTest.java
index 2e9edaf5c..0c5223924 100644
--- a/gora-jcache/src/test/java/org/apache/gora/jcache/mapreduce/JCacheStoreMapReduceTest.java
+++ b/gora-jcache/src/test/java/org/apache/gora/jcache/mapreduce/JCacheStoreMapReduceTest.java
@@ -18,7 +18,7 @@
 package org.apache.gora.jcache.mapreduce;
 
 import org.apache.gora.jcache.GoraHazelcastTestDriver;
-import org.apache.gora.mapreduce.DataStoreMapReduceTestBase;
+import org.apache.gora.io.serializer.DataStoreMapReduceTestBase;
 import org.apache.gora.examples.generated.WebPage;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.store.DataStoreFactory;
diff --git a/gora-kudu/src/test/java/org/apache/gora/kudu/mapreduce/KuduStoreMapReduceTest.java b/gora-kudu/src/test/java/org/apache/gora/kudu/mapreduce/KuduStoreMapReduceTest.java
index 60f22c991..b33d23fe8 100644
--- a/gora-kudu/src/test/java/org/apache/gora/kudu/mapreduce/KuduStoreMapReduceTest.java
+++ b/gora-kudu/src/test/java/org/apache/gora/kudu/mapreduce/KuduStoreMapReduceTest.java
@@ -21,7 +21,7 @@
 import org.apache.gora.examples.generated.WebPage;
 import org.apache.gora.kudu.GoraKuduTestDriver;
 import org.apache.gora.kudu.utils.KuduBackendConstants;
-import org.apache.gora.mapreduce.DataStoreMapReduceTestBase;
+import org.apache.gora.io.serializer.DataStoreMapReduceTestBase;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.store.DataStoreFactory;
 import org.apache.hadoop.mapred.JobConf;
diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreCountQuery.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreCountQuery.java
index 7f1c9dc21..90b562d94 100644
--- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreCountQuery.java
+++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreCountQuery.java
@@ -19,7 +19,7 @@
 
 import org.apache.gora.examples.generated.Employee;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.store.DataStore;
 import org.junit.After;
 import org.junit.Before;
diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreWordCount.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreWordCount.java
index d48c43f0e..d499a0da8 100644
--- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreWordCount.java
+++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/mapreduce/TestMongoStoreWordCount.java
@@ -19,7 +19,7 @@
 
 import org.apache.gora.examples.generated.TokenDatum;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.mongodb.store.MongoStore;
 import org.apache.gora.store.DataStoreFactory;
 import org.junit.After;
diff --git a/gora-orientdb/src/test/java/org/apache/gora/orientdb/mapreduce/OrientDBStoreMapReduceTest.java b/gora-orientdb/src/test/java/org/apache/gora/orientdb/mapreduce/OrientDBStoreMapReduceTest.java
index 7819d387a..e062dea5d 100644
--- a/gora-orientdb/src/test/java/org/apache/gora/orientdb/mapreduce/OrientDBStoreMapReduceTest.java
+++ b/gora-orientdb/src/test/java/org/apache/gora/orientdb/mapreduce/OrientDBStoreMapReduceTest.java
@@ -18,7 +18,7 @@
 
 package org.apache.gora.orientdb.mapreduce;
 
-import org.apache.gora.mapreduce.DataStoreMapReduceTestBase;
+import org.apache.gora.io.serializer.DataStoreMapReduceTestBase;
 import org.apache.gora.examples.generated.WebPage;
 import org.apache.gora.orientdb.GoraOrientDBTestDriver;
 import org.apache.gora.store.DataStore;
diff --git a/gora-orientdb/src/test/java/org/apache/gora/orientdb/mapreduce/TestOrientDBStoreWordCount.java b/gora-orientdb/src/test/java/org/apache/gora/orientdb/mapreduce/TestOrientDBStoreWordCount.java
index 4339e3904..cf33ded12 100644
--- a/gora-orientdb/src/test/java/org/apache/gora/orientdb/mapreduce/TestOrientDBStoreWordCount.java
+++ b/gora-orientdb/src/test/java/org/apache/gora/orientdb/mapreduce/TestOrientDBStoreWordCount.java
@@ -20,7 +20,7 @@
 import org.apache.gora.GoraTestDriver;
 import org.apache.gora.examples.generated.TokenDatum;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.MapReduceTestUtils;
+import org.apache.gora.io.serializer.MapReduceTestUtils;
 import org.apache.gora.orientdb.GoraOrientDBTestDriver;
 import org.apache.gora.orientdb.store.OrientDBStore;
 import org.apache.gora.store.DataStoreFactory;
diff --git a/gora-pig/src/main/java/org/apache/gora/pig/GoraDeleteStorage.java b/gora-pig/src/main/java/org/apache/gora/pig/GoraDeleteStorage.java
index 33580552d..d1dac09f8 100644
--- a/gora-pig/src/main/java/org/apache/gora/pig/GoraDeleteStorage.java
+++ b/gora-pig/src/main/java/org/apache/gora/pig/GoraDeleteStorage.java
@@ -22,7 +22,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.gora.mapreduce.GoraRecordWriter;
+import org.apache.gora.io.serializer.GoraRecordWriter;
 import org.apache.gora.persistency.impl.PersistentBase;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.RecordReader;
diff --git a/gora-pig/src/main/java/org/apache/gora/pig/GoraStorage.java b/gora-pig/src/main/java/org/apache/gora/pig/GoraStorage.java
index 4f90161ea..89fab075e 100644
--- a/gora-pig/src/main/java/org/apache/gora/pig/GoraStorage.java
+++ b/gora-pig/src/main/java/org/apache/gora/pig/GoraStorage.java
@@ -30,9 +30,9 @@
 import org.apache.avro.Schema.Field;
 import org.apache.avro.Schema.Type;
 import org.apache.avro.generic.GenericData.Array;
-import org.apache.gora.mapreduce.GoraMapReduceUtils;
-import org.apache.gora.mapreduce.GoraRecordReader;
-import org.apache.gora.mapreduce.GoraRecordWriter;
+import org.apache.gora.io.serializer.GoraMapReduceUtils;
+import org.apache.gora.io.serializer.GoraRecordReader;
+import org.apache.gora.io.serializer.GoraRecordWriter;
 import org.apache.gora.persistency.impl.PersistentBase;
 import org.apache.gora.pig.mapreduce.PigGoraInputFormat;
 import org.apache.gora.pig.mapreduce.PigGoraOutputFormat;
diff --git a/gora-pig/src/main/java/org/apache/gora/pig/mapreduce/PigGoraInputFormat.java b/gora-pig/src/main/java/org/apache/gora/pig/mapreduce/PigGoraInputFormat.java
index 7d5e50523..d2ec21cc7 100644
--- a/gora-pig/src/main/java/org/apache/gora/pig/mapreduce/PigGoraInputFormat.java
+++ b/gora-pig/src/main/java/org/apache/gora/pig/mapreduce/PigGoraInputFormat.java
@@ -21,8 +21,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.gora.mapreduce.GoraInputFormat;
-import org.apache.gora.mapreduce.GoraInputSplit;
+import org.apache.gora.io.serializer.GoraInputFormat;
+import org.apache.gora.io.serializer.GoraInputSplit;
 import org.apache.gora.persistency.impl.PersistentBase;
 import org.apache.gora.pig.StorageConfiguration;
 import org.apache.gora.query.PartitionQuery;
diff --git a/gora-pig/src/main/java/org/apache/gora/pig/mapreduce/PigGoraOutputFormat.java b/gora-pig/src/main/java/org/apache/gora/pig/mapreduce/PigGoraOutputFormat.java
index 5fe92bc8f..90935adea 100644
--- a/gora-pig/src/main/java/org/apache/gora/pig/mapreduce/PigGoraOutputFormat.java
+++ b/gora-pig/src/main/java/org/apache/gora/pig/mapreduce/PigGoraOutputFormat.java
@@ -19,8 +19,8 @@
 
 import java.io.IOException;
 
-import org.apache.gora.mapreduce.GoraRecordWriter;
-import org.apache.gora.mapreduce.NullOutputCommitter;
+import org.apache.gora.io.serializer.GoraRecordWriter;
+import org.apache.gora.io.serializer.NullOutputCommitter;
 import org.apache.gora.persistency.Persistent;
 import org.apache.gora.pig.StorageConfiguration;
 import org.apache.gora.store.DataStore;
diff --git a/gora-redis/src/test/java/org/apache/gora/redis/mapreduce/RedisStoreMapReduceTest.java b/gora-redis/src/test/java/org/apache/gora/redis/mapreduce/RedisStoreMapReduceTest.java
index 711a3f191..c3cb24425 100755
--- a/gora-redis/src/test/java/org/apache/gora/redis/mapreduce/RedisStoreMapReduceTest.java
+++ b/gora-redis/src/test/java/org/apache/gora/redis/mapreduce/RedisStoreMapReduceTest.java
@@ -19,7 +19,7 @@
 
 import java.io.IOException;
 import org.apache.gora.examples.generated.WebPage;
-import org.apache.gora.mapreduce.DataStoreMapReduceTestBase;
+import org.apache.gora.io.serializer.DataStoreMapReduceTestBase;
 import org.apache.gora.redis.GoraRedisTestDriver;
 import org.apache.gora.redis.util.ServerMode;
 import org.apache.gora.redis.util.StorageMode;
diff --git a/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java b/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
index e89aa20d4..ace949a59 100644
--- a/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
+++ b/gora-tutorial/src/main/java/org/apache/gora/tutorial/log/LogAnalytics.java
@@ -22,8 +22,8 @@
 import org.apache.avro.util.Utf8;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.gora.mapreduce.GoraMapper;
-import org.apache.gora.mapreduce.GoraReducer;
+import org.apache.gora.io.serializer.GoraMapper;
+import org.apache.gora.io.serializer.GoraReducer;
 import org.apache.gora.store.DataStore;
 import org.apache.gora.store.DataStoreFactory;
 import org.apache.gora.tutorial.log.generated.MetricDatum;