diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
index 402a1e2f1..5339bffee 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
@@ -43,7 +43,6 @@ import org.apache.olingo.client.api.domain.ClientEntity;
 import org.apache.olingo.client.api.domain.ClientProperty;
 import org.apache.olingo.client.api.domain.ClientValue;
 import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.client.core.domain.ClientEntityImpl;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
 import org.apache.olingo.commons.api.format.ContentType;
@@ -115,7 +114,8 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
   }
 
   protected void createAndDeleteOrder(final String serviceRoot, final ODataFormat format, final int id) {
-    final ClientEntity order = new ClientEntityImpl(
+
+    final ClientEntity order = getClient().getObjectFactory().newEntity(
         new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
 
     final ClientProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID",
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
index e3e9eb870..472928f97 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
@@ -49,7 +49,6 @@ import org.apache.olingo.client.api.domain.ClientEntitySet;
 import org.apache.olingo.client.api.domain.ClientProperty;
 import org.apache.olingo.client.api.domain.ClientValue;
 import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.client.core.domain.ClientEntityImpl;
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
 import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
 import org.apache.olingo.client.core.uri.URIUtils;
@@ -87,8 +86,8 @@ public class ConformanceTestITCase extends AbstractTestITCase {
    */
   @Test
   public void item2() {
-    final ClientEntity order =
-        new ClientEntityImpl(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
+    final ClientEntity order = getClient().getObjectFactory().newEntity(
+        new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
 
     final ClientProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID",
         getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2000));
diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml
index 3a9adf4ac..4bc7b7958 100644
--- a/lib/client-api/pom.xml
+++ b/lib/client-api/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>odata-client-api</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
 
   <parent>
@@ -50,5 +50,23 @@
       <artifactId>httpclient</artifactId>
     </dependency>
   </dependencies>
-	
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.olingo.client.api*
+            </Export-Package>
+            <Import-Package>
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml
index 55acb0c20..4e6068cbe 100644
--- a/lib/client-core/pom.xml
+++ b/lib/client-core/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>odata-client-core</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
 
   <parent>
@@ -77,6 +77,24 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.olingo.client.core,
+              org.apache.olingo.client.core.http,
+              org.apache.olingo.client.core.uri.URIUtils,
+              org.apache.olingo.client.core.communication.request*
+            </Export-Package>
+            <Import-Package>
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
     
     <resources>
diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml
index c28604244..55ca40df9 100644
--- a/lib/commons-api/pom.xml
+++ b/lib/commons-api/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>odata-commons-api</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
 
   <parent>
@@ -55,5 +55,23 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-    
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.olingo.commons.api*
+            </Export-Package>
+            <Import-Package>
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml
index d5bbcb146..c6d6f98fb 100644
--- a/lib/commons-core/pom.xml
+++ b/lib/commons-core/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>odata-commons-core</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
 
   <parent>
@@ -77,4 +77,27 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.olingo.commons.core,
+              org.apache.olingo.commons.core.edm,
+              org.apache.olingo.commons.core.edm.provider,
+              org.apache.olingo.commons.core.edm.primitivetype,
+              org.apache.olingo.commons.core.serialization
+            </Export-Package>
+            <Import-Package>
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml
index e331f0fb7..393939f77 100644
--- a/lib/server-api/pom.xml
+++ b/lib/server-api/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>odata-server-api</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
 
   <parent>
@@ -51,5 +51,27 @@
       <artifactId>junit</artifactId>
     </dependency>
   </dependencies>
-
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.olingo.server.api*
+            </Export-Package>
+            <Import-Package>
+              *
+            </Import-Package>
+            <!-- workaround due to the current server-api server-core interdependency -->
+            <DynamicImport-Package>
+              org.apache.olingo.server.core
+            </DynamicImport-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml
index f081ebc1a..1c2d1f57d 100644
--- a/lib/server-core/pom.xml
+++ b/lib/server-core/pom.xml
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>odata-server-core</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
 
   <parent>
@@ -78,6 +78,7 @@
 
   <build>
     <plugins>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -114,6 +115,21 @@
           <libDirectory>src/main/antlr4/org/apache/olingo/server/core/uri/antlr</libDirectory>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.olingo.server.core
+            </Export-Package>
+            <Import-Package>
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index b70c756b8..84ae71857 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,10 +80,10 @@
     <velocity.version>1.7</velocity.version>
     <maven.plugin.api.version>3.2.2</maven.plugin.api.version>
     <maven.plugin.tools.version>3.3</maven.plugin.tools.version>
-
+    <maven.bundle.plugin.version>2.3.4</maven.bundle.plugin.version>
     <hc.client.version>4.2.6</hc.client.version>
     <jackson.version>2.4.2</jackson.version>
-    <aalto-xml.version>0.9.9</aalto-xml.version>
+    <aalto-xml.version>0.9.10</aalto-xml.version>
 
     <antlr.version>4.1</antlr.version>
 
@@ -130,6 +130,11 @@
         <version>${antlr.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${maven.bundle.plugin.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>