diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3Client.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3Client.java
index 08a941dcc..4555c8c04 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3Client.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV3Client.java
@@ -18,9 +18,9 @@
  */
 package org.apache.olingo.odata4.client.core;
 
-import org.apache.olingo.odata4.client.core.data.impl.v3.ODataDeserializerImpl;
-import org.apache.olingo.odata4.client.core.data.impl.v3.ODataReaderImpl;
-import org.apache.olingo.odata4.client.core.data.impl.v3.ODataSerializerImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v3.ODataDeserializerImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v3.ODataReaderImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v3.ODataSerializerImpl;
 import org.apache.olingo.odata4.commons.api.edm.constants.ODataServiceVersion;
 
 public class ODataV3Client extends AbstractODataClient {
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4Client.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4Client.java
index 55d4adf31..6fdc8b0d9 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4Client.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataV4Client.java
@@ -18,9 +18,9 @@
  */
 package org.apache.olingo.odata4.client.core;
 
-import org.apache.olingo.odata4.client.core.data.impl.v4.ODataDeserializerImpl;
-import org.apache.olingo.odata4.client.core.data.impl.v4.ODataReaderImpl;
-import org.apache.olingo.odata4.client.core.data.impl.v4.ODataSerializerImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v4.ODataDeserializerImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v4.ODataReaderImpl;
+import org.apache.olingo.odata4.client.core.op.impl.v4.ODataSerializerImpl;
 import org.apache.olingo.odata4.commons.api.edm.constants.ODataServiceVersion;
 
 public class ODataV4Client extends AbstractODataClient {
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataDeserializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataDeserializerImpl.java
similarity index 79%
rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataDeserializerImpl.java
rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataDeserializerImpl.java
index a00eba72f..f47cd83ce 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataDeserializerImpl.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataDeserializerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.core.data.impl.v3;
+package org.apache.olingo.odata4.client.core.op.impl.v3;
 
 import java.io.InputStream;
 import org.apache.olingo.odata4.client.api.ODataClient;
@@ -25,20 +25,20 @@ import org.apache.olingo.odata4.client.core.edm.v3.EdmxImpl;
 
 public class ODataDeserializerImpl extends AbstractODataDeserializer {
 
-    private static final long serialVersionUID = -8221085862548914611L;
+  private static final long serialVersionUID = -8221085862548914611L;
 
-    public ODataDeserializerImpl(final ODataClient client) {
-        super(client);
-    }
+  public ODataDeserializerImpl(final ODataClient client) {
+    super(client);
+  }
 
-    @Override
-    public EdmxImpl toMetadata(final InputStream input) {
-        try {
-            return getXmlMapper().readValue(input, EdmxImpl.class);
-        } catch (Exception e) {
-            throw new IllegalArgumentException("Could not parse as Edmx document", e);
-        }
+  @Override
+  public EdmxImpl toMetadata(final InputStream input) {
+    try {
+      return getXmlMapper().readValue(input, EdmxImpl.class);
+    } catch (Exception e) {
+      throw new IllegalArgumentException("Could not parse as Edmx document", e);
     }
+  }
 
 //    @Override
 //    public AbstractServiceDocument toServiceDocument(final InputStream input, final ODataFormat format) {
@@ -59,5 +59,4 @@ public class ODataDeserializerImpl extends AbstractODataDeserializer {
 //            throw new IllegalArgumentException("While deserializing JSON entry", e);
 //        }
 //    }
-
 }
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataReaderImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataReaderImpl.java
similarity index 93%
rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataReaderImpl.java
rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataReaderImpl.java
index 180a8a07c..83f049430 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataReaderImpl.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataReaderImpl.java
@@ -16,10 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.core.data.impl.v3;
+package org.apache.olingo.odata4.client.core.op.impl.v3;
 
 import java.io.InputStream;
-import org.apache.olingo.odata4.client.api.edm.EdmMetadata;
 import org.apache.olingo.odata4.client.core.ODataV3Client;
 import org.apache.olingo.odata4.client.core.op.impl.AbstractODataReader;
 import org.apache.olingo.odata4.client.core.edm.v3.EdmMetadataImpl;
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataSerializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataSerializerImpl.java
similarity index 95%
rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataSerializerImpl.java
rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataSerializerImpl.java
index 32111bef4..2fbdddc3e 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v3/ODataSerializerImpl.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v3/ODataSerializerImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.core.data.impl.v3;
+package org.apache.olingo.odata4.client.core.op.impl.v3;
 
 import org.apache.olingo.odata4.client.api.ODataClient;
 import org.apache.olingo.odata4.client.core.op.impl.AbstractODataSerializer;
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataDeserializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataDeserializerImpl.java
similarity index 97%
rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataDeserializerImpl.java
rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataDeserializerImpl.java
index 2f3682c34..d67adc2c8 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataDeserializerImpl.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataDeserializerImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.core.data.impl.v4;
+package org.apache.olingo.odata4.client.core.op.impl.v4;
 
 import java.io.InputStream;
 import org.apache.olingo.odata4.client.api.ODataClient;
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataReaderImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataReaderImpl.java
similarity index 96%
rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataReaderImpl.java
rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataReaderImpl.java
index 05989c85e..11b7112f2 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataReaderImpl.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataReaderImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.core.data.impl.v4;
+package org.apache.olingo.odata4.client.core.op.impl.v4;
 
 import java.io.InputStream;
 import org.apache.olingo.odata4.client.core.ODataV4Client;
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataSerializerImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataSerializerImpl.java
similarity index 95%
rename from odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataSerializerImpl.java
rename to odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataSerializerImpl.java
index c58e0fb5b..a5a24c853 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/data/impl/v4/ODataSerializerImpl.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/op/impl/v4/ODataSerializerImpl.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.olingo.odata4.client.core.data.impl.v4;
+package org.apache.olingo.odata4.client.core.op.impl.v4;
 
 import org.apache.olingo.odata4.client.api.ODataClient;
 import org.apache.olingo.odata4.client.core.op.impl.AbstractODataSerializer;