diff --git a/core-java/README.md b/core-java/README.md
index 440af67252..fbbfa65589 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -18,3 +18,4 @@
 - [MD5 Hashing in Java](http://www.baeldung.com/java-md5)
 - [Guide to the Java ArrayList](http://www.baeldung.com/java-arraylist)
 - [Guide to Java Reflection](http://www.baeldung.com/java-reflection)
+- [A Guide to Java Sockets](http://www.baeldung.com/a-guide-to-java-sockets)
diff --git a/sockets/src/main/java/com/baeldung/socket/EchoClient.java b/core-java/src/main/java/com/baeldung/socket/EchoClient.java
similarity index 100%
rename from sockets/src/main/java/com/baeldung/socket/EchoClient.java
rename to core-java/src/main/java/com/baeldung/socket/EchoClient.java
diff --git a/sockets/src/main/java/com/baeldung/socket/EchoMultiServer.java b/core-java/src/main/java/com/baeldung/socket/EchoMultiServer.java
similarity index 97%
rename from sockets/src/main/java/com/baeldung/socket/EchoMultiServer.java
rename to core-java/src/main/java/com/baeldung/socket/EchoMultiServer.java
index 2ece1ceebe..1177b82c87 100644
--- a/sockets/src/main/java/com/baeldung/socket/EchoMultiServer.java
+++ b/core-java/src/main/java/com/baeldung/socket/EchoMultiServer.java
@@ -46,7 +46,7 @@ public class EchoMultiServer {
 						clientSocket.getInputStream()));
 				String inputLine;
 				while ((inputLine = in.readLine()) != null) {
-					if (".".equals(inputLine)) {
+					if ("".equals(inputLine)) {
 						out.println("bye");
 						break;
 					}
diff --git a/sockets/src/main/java/com/baeldung/socket/EchoServer.java b/core-java/src/main/java/com/baeldung/socket/EchoServer.java
similarity index 96%
rename from sockets/src/main/java/com/baeldung/socket/EchoServer.java
rename to core-java/src/main/java/com/baeldung/socket/EchoServer.java
index 3607afa7f5..395624933c 100644
--- a/sockets/src/main/java/com/baeldung/socket/EchoServer.java
+++ b/core-java/src/main/java/com/baeldung/socket/EchoServer.java
@@ -18,7 +18,7 @@ public class EchoServer {
 					clientSocket.getInputStream()));
 			String inputLine;
 			while ((inputLine = in.readLine()) != null) {
-				if (".".equals(inputLine)) {
+				if ("".equals(inputLine)) {
 					out.println("good bye");
 					break;
 				}
diff --git a/sockets/src/main/java/com/baeldung/socket/GreetClient.java b/core-java/src/main/java/com/baeldung/socket/GreetClient.java
similarity index 100%
rename from sockets/src/main/java/com/baeldung/socket/GreetClient.java
rename to core-java/src/main/java/com/baeldung/socket/GreetClient.java
diff --git a/sockets/src/main/java/com/baeldung/socket/GreetServer.java b/core-java/src/main/java/com/baeldung/socket/GreetServer.java
similarity index 100%
rename from sockets/src/main/java/com/baeldung/socket/GreetServer.java
rename to core-java/src/main/java/com/baeldung/socket/GreetServer.java
diff --git a/sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java b/core-java/src/test/java/com/baeldung/socket/EchoMultiTest.java
similarity index 91%
rename from sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java
rename to core-java/src/test/java/com/baeldung/socket/EchoMultiTest.java
index 19a59c211c..ef08385551 100644
--- a/sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java
+++ b/core-java/src/test/java/com/baeldung/socket/EchoMultiTest.java
@@ -21,7 +21,7 @@ public class EchoMultiTest {
 		client.startConnection("127.0.0.1", 5555);
 		String msg1 = client.sendMessage("hello");
 		String msg2 = client.sendMessage("world");
-		String terminate = client.sendMessage(".");
+		String terminate = client.sendMessage("");
 		assertEquals(msg1, "hello");
 		assertEquals(msg2, "world");
 		assertEquals(terminate, "bye");
@@ -34,7 +34,7 @@ public class EchoMultiTest {
 		client.startConnection("127.0.0.1", 5555);
 		String msg1 = client.sendMessage("hello");
 		String msg2 = client.sendMessage("world");
-		String terminate = client.sendMessage(".");
+		String terminate = client.sendMessage("");
 		assertEquals(msg1, "hello");
 		assertEquals(msg2, "world");
 		assertEquals(terminate, "bye");
@@ -47,7 +47,7 @@ public class EchoMultiTest {
 		client.startConnection("127.0.0.1", 5555);
 		String msg1 = client.sendMessage("hello");
 		String msg2 = client.sendMessage("world");
-		String terminate = client.sendMessage(".");
+		String terminate = client.sendMessage("");
 		assertEquals(msg1, "hello");
 		assertEquals(msg2, "world");
 		assertEquals(terminate, "bye");
diff --git a/sockets/src/test/java/com/baeldung/socket/EchoTest.java b/core-java/src/test/java/com/baeldung/socket/EchoTest.java
similarity index 95%
rename from sockets/src/test/java/com/baeldung/socket/EchoTest.java
rename to core-java/src/test/java/com/baeldung/socket/EchoTest.java
index 0f0c02e4d8..c12bd28a29 100644
--- a/sockets/src/test/java/com/baeldung/socket/EchoTest.java
+++ b/core-java/src/test/java/com/baeldung/socket/EchoTest.java
@@ -26,7 +26,7 @@ public class EchoTest {
 		String resp1 = client.sendMessage("hello");
 		String resp2 = client.sendMessage("world");
 		String resp3 = client.sendMessage("!");
-		String resp4 = client.sendMessage(".");
+		String resp4 = client.sendMessage("");
 		assertEquals("hello", resp1);
 		assertEquals("world", resp2);
 		assertEquals("!", resp3);
diff --git a/sockets/src/test/java/com/baeldung/socket/GreetServerTest.java b/core-java/src/test/java/com/baeldung/socket/GreetServerTest.java
similarity index 100%
rename from sockets/src/test/java/com/baeldung/socket/GreetServerTest.java
rename to core-java/src/test/java/com/baeldung/socket/GreetServerTest.java
diff --git a/sockets/README.md b/sockets/README.md
deleted file mode 100644
index ad8811ee80..0000000000
--- a/sockets/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-### Relevant Articles:
-- [A Guide to Java Sockets](http://www.baeldung.com/a-guide-to-java-sockets)
diff --git a/sockets/pom.xml b/sockets/pom.xml
deleted file mode 100644
index 24e8e436f3..0000000000
--- a/sockets/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<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>
-	<groupId>com.baeldung</groupId>
-	<artifactId>sockets</artifactId>
-	<version>1.0</version>
-	<name>sockets</name>
-   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-          <source>8</source>
-          <target>8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.3</version>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-</project>