diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml
index 30319d7e1..d8ff842c6 100644
--- a/lib/server-api/pom.xml
+++ b/lib/server-api/pom.xml
@@ -46,15 +46,17 @@
       <version>2.5</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>4.1.16.Final</version>
+    </dependency>
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
-    <dependency>
-	  <groupId>io.netty</groupId>
-	  <artifactId>netty-all</artifactId>
-	  <version>4.1.16.Final</version>
-	</dependency>
   </dependencies>
 
   <build>
@@ -74,7 +76,8 @@
         <configuration>
           <instructions>
             <Export-Package>
-              org.apache.olingo.server.api*
+              org.apache.olingo.server.api*,
+              org.apache.olingo.netty.server.api*
             </Export-Package>
             <Import-Package>
               *
diff --git a/lib/server-api/src/main/java/org/apache/olingo/netty/server/api/package-info.java b/lib/server-api/src/main/java/org/apache/olingo/netty/server/api/package-info.java
new file mode 100644
index 000000000..d1d4d4604
--- /dev/null
+++ b/lib/server-api/src/main/java/org/apache/olingo/netty/server/api/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+/**
+ * Netty handler for Olingo Server API
+ * <p>
+ * The netty package is used to condense all Netty related parts used in Olingo.
+ *
+ */
+package org.apache.olingo.netty.server.api;
\ No newline at end of file
diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml
index 673abed06..4818ca39b 100644
--- a/lib/server-core/pom.xml
+++ b/lib/server-core/pom.xml
@@ -51,13 +51,8 @@
       <version>2.5</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
 
-	<dependency>
+  	<dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>
@@ -75,15 +70,22 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>4.1.16.Final</version>
+    </dependency>
+    <!-- Test dependencies -->
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
-	  <groupId>io.netty</groupId>
-	  <artifactId>netty-all</artifactId>
-	  <version>4.1.16.Final</version>
-	</dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>