diff --git a/libraries-server/README.md b/libraries-server/README.md
new file mode 100644
index 0000000000..cff201fe07
--- /dev/null
+++ b/libraries-server/README.md
@@ -0,0 +1,7 @@
+### Relevant articles
+
+- [Embedded Jetty Server in Java](http://www.baeldung.com/jetty-embedded)
+- [Introduction to Netty](http://www.baeldung.com/netty)
+- [Exceptions in Netty](http://www.baeldung.com/netty-exception-handling)
+- [Programatically Create, Configure, and Run a Tomcat Server](http://www.baeldung.com/tomcat-programmatic-setup)
+- [Creating and Configuring Jetty 9 Server in Java](http://www.baeldung.com/jetty-java-programmatic)
diff --git a/libraries-server/pom.xml b/libraries-server/pom.xml
index 517cf6a07c..6fca09faf4 100644
--- a/libraries-server/pom.xml
+++ b/libraries-server/pom.xml
@@ -14,6 +14,73 @@
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
             <version>1.2.0</version>
-        </dependency>	
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons.io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${netty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+		
+        <!-- tomcat -->
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-catalina</artifactId>
+            <version>${tomcat.version}</version>
+        </dependency>
     </dependencies>
- </project>
\ No newline at end of file
+
+    <properties>
+        <assertj.version>3.6.2</assertj.version>
+        <httpclient.version>4.5.3</httpclient.version>
+        <commons.io.version>2.5</commons.io.version>
+        <jetty.version>9.4.8.v20171121</jetty.version>
+        <netty.version>4.1.20.Final</netty.version>
+        <commons.collections.version>4.1</commons.collections.version>
+        <junit.version>4.12</junit.version>
+        <tomcat.version>8.5.24</tomcat.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/libraries/src/main/java/com/baeldung/jetty/AsyncServlet.java b/libraries-server/src/main/java/com/baeldung/jetty/AsyncServlet.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/jetty/AsyncServlet.java
rename to libraries-server/src/main/java/com/baeldung/jetty/AsyncServlet.java
diff --git a/libraries/src/main/java/com/baeldung/jetty/BlockingServlet.java b/libraries-server/src/main/java/com/baeldung/jetty/BlockingServlet.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/jetty/BlockingServlet.java
rename to libraries-server/src/main/java/com/baeldung/jetty/BlockingServlet.java
diff --git a/libraries/src/main/java/com/baeldung/jetty/JettyServer.java b/libraries-server/src/main/java/com/baeldung/jetty/JettyServer.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/jetty/JettyServer.java
rename to libraries-server/src/main/java/com/baeldung/jetty/JettyServer.java
diff --git a/libraries/src/main/java/com/baeldung/jetty/JettyServerFactory.java b/libraries-server/src/main/java/com/baeldung/jetty/JettyServerFactory.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/jetty/JettyServerFactory.java
rename to libraries-server/src/main/java/com/baeldung/jetty/JettyServerFactory.java
diff --git a/libraries/src/main/java/com/baeldung/jetty/LoggingRequestHandler.java b/libraries-server/src/main/java/com/baeldung/jetty/LoggingRequestHandler.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/jetty/LoggingRequestHandler.java
rename to libraries-server/src/main/java/com/baeldung/jetty/LoggingRequestHandler.java
diff --git a/libraries/src/main/java/com/baeldung/netty/CalculatorOperationHandler.java b/libraries-server/src/main/java/com/baeldung/netty/CalculatorOperationHandler.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/CalculatorOperationHandler.java
rename to libraries-server/src/main/java/com/baeldung/netty/CalculatorOperationHandler.java
diff --git a/libraries/src/main/java/com/baeldung/netty/ChannelHandlerA.java b/libraries-server/src/main/java/com/baeldung/netty/ChannelHandlerA.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/ChannelHandlerA.java
rename to libraries-server/src/main/java/com/baeldung/netty/ChannelHandlerA.java
diff --git a/libraries/src/main/java/com/baeldung/netty/ChannelHandlerB.java b/libraries-server/src/main/java/com/baeldung/netty/ChannelHandlerB.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/ChannelHandlerB.java
rename to libraries-server/src/main/java/com/baeldung/netty/ChannelHandlerB.java
diff --git a/libraries/src/main/java/com/baeldung/netty/ClientHandler.java b/libraries-server/src/main/java/com/baeldung/netty/ClientHandler.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/ClientHandler.java
rename to libraries-server/src/main/java/com/baeldung/netty/ClientHandler.java
diff --git a/libraries/src/main/java/com/baeldung/netty/HttpMessageHandler.java b/libraries-server/src/main/java/com/baeldung/netty/HttpMessageHandler.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/HttpMessageHandler.java
rename to libraries-server/src/main/java/com/baeldung/netty/HttpMessageHandler.java
diff --git a/libraries/src/main/java/com/baeldung/netty/NettyClient.java b/libraries-server/src/main/java/com/baeldung/netty/NettyClient.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/NettyClient.java
rename to libraries-server/src/main/java/com/baeldung/netty/NettyClient.java
diff --git a/libraries/src/main/java/com/baeldung/netty/NettyServer.java b/libraries-server/src/main/java/com/baeldung/netty/NettyServer.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/NettyServer.java
rename to libraries-server/src/main/java/com/baeldung/netty/NettyServer.java
diff --git a/libraries/src/main/java/com/baeldung/netty/NettyServerB.java b/libraries-server/src/main/java/com/baeldung/netty/NettyServerB.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/NettyServerB.java
rename to libraries-server/src/main/java/com/baeldung/netty/NettyServerB.java
diff --git a/libraries/src/main/java/com/baeldung/netty/Operation.java b/libraries-server/src/main/java/com/baeldung/netty/Operation.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/Operation.java
rename to libraries-server/src/main/java/com/baeldung/netty/Operation.java
diff --git a/libraries/src/main/java/com/baeldung/netty/ProcessingHandler.java b/libraries-server/src/main/java/com/baeldung/netty/ProcessingHandler.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/ProcessingHandler.java
rename to libraries-server/src/main/java/com/baeldung/netty/ProcessingHandler.java
diff --git a/libraries/src/main/java/com/baeldung/netty/RequestData.java b/libraries-server/src/main/java/com/baeldung/netty/RequestData.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/RequestData.java
rename to libraries-server/src/main/java/com/baeldung/netty/RequestData.java
diff --git a/libraries/src/main/java/com/baeldung/netty/RequestDataEncoder.java b/libraries-server/src/main/java/com/baeldung/netty/RequestDataEncoder.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/RequestDataEncoder.java
rename to libraries-server/src/main/java/com/baeldung/netty/RequestDataEncoder.java
diff --git a/libraries/src/main/java/com/baeldung/netty/RequestDecoder.java b/libraries-server/src/main/java/com/baeldung/netty/RequestDecoder.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/RequestDecoder.java
rename to libraries-server/src/main/java/com/baeldung/netty/RequestDecoder.java
diff --git a/libraries/src/main/java/com/baeldung/netty/ResponseData.java b/libraries-server/src/main/java/com/baeldung/netty/ResponseData.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/ResponseData.java
rename to libraries-server/src/main/java/com/baeldung/netty/ResponseData.java
diff --git a/libraries/src/main/java/com/baeldung/netty/ResponseDataDecoder.java b/libraries-server/src/main/java/com/baeldung/netty/ResponseDataDecoder.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/ResponseDataDecoder.java
rename to libraries-server/src/main/java/com/baeldung/netty/ResponseDataDecoder.java
diff --git a/libraries/src/main/java/com/baeldung/netty/ResponseDataEncoder.java b/libraries-server/src/main/java/com/baeldung/netty/ResponseDataEncoder.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/ResponseDataEncoder.java
rename to libraries-server/src/main/java/com/baeldung/netty/ResponseDataEncoder.java
diff --git a/libraries/src/main/java/com/baeldung/netty/SimpleProcessingHandler.java b/libraries-server/src/main/java/com/baeldung/netty/SimpleProcessingHandler.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/netty/SimpleProcessingHandler.java
rename to libraries-server/src/main/java/com/baeldung/netty/SimpleProcessingHandler.java
diff --git a/libraries/src/main/java/com/baeldung/tomcat/MyFilter.java b/libraries-server/src/main/java/com/baeldung/tomcat/MyFilter.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/tomcat/MyFilter.java
rename to libraries-server/src/main/java/com/baeldung/tomcat/MyFilter.java
diff --git a/libraries/src/main/java/com/baeldung/tomcat/MyServlet.java b/libraries-server/src/main/java/com/baeldung/tomcat/MyServlet.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/tomcat/MyServlet.java
rename to libraries-server/src/main/java/com/baeldung/tomcat/MyServlet.java
diff --git a/libraries/src/main/java/com/baeldung/tomcat/ProgrammaticTomcat.java b/libraries-server/src/main/java/com/baeldung/tomcat/ProgrammaticTomcat.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/tomcat/ProgrammaticTomcat.java
rename to libraries-server/src/main/java/com/baeldung/tomcat/ProgrammaticTomcat.java
diff --git a/libraries/src/test/java/com/baeldung/jetty/JettyIntegrationTest.java b/libraries-server/src/test/java/com/baeldung/jetty/JettyIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/jetty/JettyIntegrationTest.java
rename to libraries-server/src/test/java/com/baeldung/jetty/JettyIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/jetty/JettyServerFactoryUnitTest.java b/libraries-server/src/test/java/com/baeldung/jetty/JettyServerFactoryUnitTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/jetty/JettyServerFactoryUnitTest.java
rename to libraries-server/src/test/java/com/baeldung/jetty/JettyServerFactoryUnitTest.java
diff --git a/libraries/src/test/java/com/baeldung/netty/EmbeddedChannelUnitTest.java b/libraries-server/src/test/java/com/baeldung/netty/EmbeddedChannelUnitTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/netty/EmbeddedChannelUnitTest.java
rename to libraries-server/src/test/java/com/baeldung/netty/EmbeddedChannelUnitTest.java
diff --git a/libraries/src/test/java/com/baeldung/tomcat/ProgrammaticTomcatIntegrationTest.java b/libraries-server/src/test/java/com/baeldung/tomcat/ProgrammaticTomcatIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/tomcat/ProgrammaticTomcatIntegrationTest.java
rename to libraries-server/src/test/java/com/baeldung/tomcat/ProgrammaticTomcatIntegrationTest.java
diff --git a/libraries/src/test/resources/jetty-embedded-demo-app.war b/libraries-server/src/test/resources/jetty-embedded-demo-app.war
similarity index 100%
rename from libraries/src/test/resources/jetty-embedded-demo-app.war
rename to libraries-server/src/test/resources/jetty-embedded-demo-app.war
diff --git a/libraries/README.md b/libraries/README.md
index aad3a644ad..13ec65c29e 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -5,13 +5,11 @@
 - [String Processing with Apache Commons Lang 3](http://www.baeldung.com/string-processing-commons-lang)
 - [Introduction to Javatuples](http://www.baeldung.com/java-tuples)
 - [Introduction to Javassist](http://www.baeldung.com/javassist)
-- [Embedded Jetty Server in Java](http://www.baeldung.com/jetty-embedded)
 - [Introduction to Apache Flink with Java](http://www.baeldung.com/apache-flink)
 - [Introduction to JSONassert](http://www.baeldung.com/jsonassert)
 - [Intro to JaVers](http://www.baeldung.com/javers)
 - [Introduction to Apache Commons Math](http://www.baeldung.com/apache-commons-math)
 - [Intro to Serenity BDD](http://www.baeldung.com/serenity-bdd)
-- [Introduction to Netty](http://www.baeldung.com/netty)
 - [Merging Streams in Java](http://www.baeldung.com/java-merge-streams)
 - [Serenity BDD and Screenplay](http://www.baeldung.com/serenity-screenplay)
 - [Introduction to Quartz](http://www.baeldung.com/quartz)
@@ -54,10 +52,7 @@
 - [Introduction to BouncyCastle with Java](http://www.baeldung.com/java-bouncy-castle)
 - [Guide to google-http-client](http://www.baeldung.com/google-http-client)
 - [Interact with Google Sheets from Java](http://www.baeldung.com/google-sheets-java-client)
-- [Programatically Create, Configure, and Run a Tomcat Server](http://www.baeldung.com/tomcat-programmatic-setup)
 - [A Docker Guide for Java](http://www.baeldung.com/docker-java-api)
-- [Exceptions in Netty](http://www.baeldung.com/netty-exception-handling)
-- [Creating and Configuring Jetty 9 Server in Java](http://www.baeldung.com/jetty-java-programmatic)
 - [Introduction To OpenCSV](http://www.baeldung.com/opencsv)
 - [Introduction to Akka Actors in Java](http://www.baeldung.com/akka-actors-java)
 - [Asynchronous HTTP with async-http-client in Java](http://www.baeldung.com/async-http-client)
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 6b1f842aeb..80e3303ba5 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -106,21 +106,6 @@
             <artifactId>javers-core</artifactId>
             <version>${javers.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-            <version>${jetty.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>io.nats</groupId>
@@ -379,11 +364,6 @@
             <artifactId>jmh-generator-annprocess</artifactId>
             <version>${jmh.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>${netty.version}</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -658,13 +638,7 @@
             <classifier>test</classifier>
             <scope>test</scope>
         </dependency>
-
-        <!-- tomcat -->
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina</artifactId>
-            <version>${tomcat.version}</version>
-        </dependency>
+		
         <dependency>
             <groupId>org.milyn</groupId>
             <artifactId>milyn-smooks-all</artifactId>
@@ -924,7 +898,6 @@
         <commons.io.version>2.5</commons.io.version>
         <commons.dbutils.version>1.6</commons.dbutils.version>
         <h2.version>1.4.196</h2.version>
-        <jetty.version>9.4.8.v20171121</jetty.version>
         <jnats.version>1.0</jnats.version>
 
         <httpclient.version>4.5.3</httpclient.version>
@@ -937,7 +910,6 @@
         <serenity.jira.version>1.9.0</serenity.jira.version>
         <serenity.plugin.version>1.9.27</serenity.plugin.version>
         <jUnitParams.version>1.1.0</jUnitParams.version>
-        <netty.version>4.1.20.Final</netty.version>
         <commons.collections.version>4.1</commons.collections.version>
         <junit.version>4.12</junit.version>
         <java-lsh.version>0.10</java-lsh.version>
@@ -966,7 +938,6 @@
         <kafka.version>1.0.0</kafka.version>
         <smooks.version>1.7.0</smooks.version>
         <docker.version>3.0.14</docker.version>
-        <tomcat.version>8.5.24</tomcat.version>
         <async.http.client.version>2.2.0</async.http.client.version>
         <infinispan.version>9.1.5.Final</infinispan.version>
         <opencsv.version>4.1</opencsv.version>