diff --git a/finagle/README.md b/libraries-rpc/README.md
similarity index 100%
rename from finagle/README.md
rename to libraries-rpc/README.md
diff --git a/finagle/pom.xml b/libraries-rpc/pom.xml
similarity index 92%
rename from finagle/pom.xml
rename to libraries-rpc/pom.xml
index f1dc932c13..145693cac1 100644
--- a/finagle/pom.xml
+++ b/libraries-rpc/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>Finagle</artifactId>
-    <name>Finagle</name>
+    <artifactId>libraries-rpc</artifactId>
+    <name>libraries-rpc</name>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/finagle/src/main/java/com/baeldung/finagle/Client.java b/libraries-rpc/src/main/java/com/baeldung/rpc/finagle/Client.java
similarity index 96%
rename from finagle/src/main/java/com/baeldung/finagle/Client.java
rename to libraries-rpc/src/main/java/com/baeldung/rpc/finagle/Client.java
index a881f1c37c..989c79f302 100644
--- a/finagle/src/main/java/com/baeldung/finagle/Client.java
+++ b/libraries-rpc/src/main/java/com/baeldung/rpc/finagle/Client.java
@@ -1,4 +1,4 @@
-package com.baeldung.finagle;
+package com.baeldung.rpc.finagle;
 
 import com.twitter.finagle.Http;
 import com.twitter.finagle.Service;
diff --git a/finagle/src/main/java/com/baeldung/finagle/GreetingService.java b/libraries-rpc/src/main/java/com/baeldung/rpc/finagle/GreetingService.java
similarity index 95%
rename from finagle/src/main/java/com/baeldung/finagle/GreetingService.java
rename to libraries-rpc/src/main/java/com/baeldung/rpc/finagle/GreetingService.java
index c795724192..7f3d741f94 100644
--- a/finagle/src/main/java/com/baeldung/finagle/GreetingService.java
+++ b/libraries-rpc/src/main/java/com/baeldung/rpc/finagle/GreetingService.java
@@ -1,4 +1,4 @@
-package com.baeldung.finagle;
+package com.baeldung.rpc.finagle;
 
 import com.twitter.finagle.Service;
 import com.twitter.finagle.http.Request;
diff --git a/finagle/src/main/java/com/baeldung/finagle/LogFilter.java b/libraries-rpc/src/main/java/com/baeldung/rpc/finagle/LogFilter.java
similarity index 95%
rename from finagle/src/main/java/com/baeldung/finagle/LogFilter.java
rename to libraries-rpc/src/main/java/com/baeldung/rpc/finagle/LogFilter.java
index d381456cfe..3ef57ed18f 100644
--- a/finagle/src/main/java/com/baeldung/finagle/LogFilter.java
+++ b/libraries-rpc/src/main/java/com/baeldung/rpc/finagle/LogFilter.java
@@ -1,4 +1,4 @@
-package com.baeldung.finagle;
+package com.baeldung.rpc.finagle;
 
 import com.twitter.finagle.Service;
 import com.twitter.finagle.SimpleFilter;
diff --git a/finagle/src/main/java/com/baeldung/finagle/Server.java b/libraries-rpc/src/main/java/com/baeldung/rpc/finagle/Server.java
similarity index 93%
rename from finagle/src/main/java/com/baeldung/finagle/Server.java
rename to libraries-rpc/src/main/java/com/baeldung/rpc/finagle/Server.java
index 8a9c9be192..5bc8d93eaf 100644
--- a/finagle/src/main/java/com/baeldung/finagle/Server.java
+++ b/libraries-rpc/src/main/java/com/baeldung/rpc/finagle/Server.java
@@ -1,4 +1,4 @@
-package com.baeldung.finagle;
+package com.baeldung.rpc.finagle;
 
 import com.twitter.finagle.Http;
 import com.twitter.finagle.ListeningServer;
diff --git a/finagle/src/main/resources/logback.xml b/libraries-rpc/src/main/resources/logback.xml
similarity index 100%
rename from finagle/src/main/resources/logback.xml
rename to libraries-rpc/src/main/resources/logback.xml
diff --git a/finagle/src/main/resources/twitter4j.properties b/libraries-rpc/src/main/resources/twitter4j.properties
similarity index 100%
rename from finagle/src/main/resources/twitter4j.properties
rename to libraries-rpc/src/main/resources/twitter4j.properties
diff --git a/libraries-rpc/src/test/java/com/baeldung/rpc/finagle/ClientServerTest.java b/libraries-rpc/src/test/java/com/baeldung/rpc/finagle/ClientServerTest.java
new file mode 100644
index 0000000000..b3faa1968c
--- /dev/null
+++ b/libraries-rpc/src/test/java/com/baeldung/rpc/finagle/ClientServerTest.java
@@ -0,0 +1,40 @@
+package com.baeldung.rpc.finagle;
+
+import com.twitter.finagle.Http;
+import com.twitter.finagle.Service;
+import com.twitter.finagle.http.Method;
+import com.twitter.finagle.http.Request;
+import com.twitter.finagle.http.Response;
+import com.twitter.util.Await;
+import com.twitter.util.Future;
+import org.junit.Test;
+import scala.runtime.BoxedUnit;
+
+import static org.junit.Assert.assertEquals;
+
+public class ClientServerTest {
+    @Test
+    public void clientShouldReceiveResponseFromServer() throws Exception {
+        // given
+        Service serverService = new LogFilter().andThen(new GreetingService());
+        Http.serve(":8080", serverService);
+
+        Service<Request, Response> clientService = new LogFilter().andThen(Http.newService(":8080"));
+
+        // when
+        Request request = Request.apply(Method.Get(), "/?name=John");
+        request.host("localhost");
+        Future<Response> response = clientService.apply(request);
+
+        // then
+        Await.result(response
+                .onSuccess(r -> {
+                    assertEquals("Hello John", r.getContentString());
+                    return BoxedUnit.UNIT;
+                })
+                .onFailure(r -> {
+                    throw new RuntimeException(r);
+                })
+        );
+    }
+}
diff --git a/pom.xml b/pom.xml
index 813a42c93d..c16775bfc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -418,7 +418,6 @@
                 <module>ethereum</module>
 
                 <module>feign</module>
-                <module>finagle</module>
                 <module>flyway-cdi-extension</module>
 
                 <module>geotools</module>
@@ -509,6 +508,7 @@
                 <module>libraries-http-2</module>
                 <module>libraries-io</module>
                 <module>libraries-primitive</module>
+                <module>libraries-rpc</module>
                 <module>libraries-security</module>
                 <module>libraries-server</module>
                 <module>libraries-testing</module>