diff --git a/elasticsearch/README.md b/elasticsearch/README.md
deleted file mode 100644
index e21070dbee..0000000000
--- a/elasticsearch/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-=========
-
-## ElasticSearch
-
-### Relevant Articles: 
-- [A Guide to ElasticSearch](http://www.baeldung.com/????????)
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
deleted file mode 100644
index 1c580529e6..0000000000
--- a/elasticsearch/pom.xml
+++ /dev/null
@@ -1,49 +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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.baeldung</groupId>
-    <artifactId>elasticsearch</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>elasticsearch</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>2.3.5</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.13</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/pom.xml b/pom.xml
index a1d3e05302..8115c1e902 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,6 @@
         <module>dozer</module>
         <module>dependency-injection</module>
         <module>deltaspike</module>
-        <module>elasticsearch</module>
 
         <module>enterprise-patterns</module>
         <module>feign-client</module>
diff --git a/spring-data-elasticsearch/pom.xml b/spring-data-elasticsearch/pom.xml
index 3a6e330564..084695c2f3 100644
--- a/spring-data-elasticsearch/pom.xml
+++ b/spring-data-elasticsearch/pom.xml
@@ -69,6 +69,17 @@
 			<artifactId>log4j-over-slf4j</artifactId>
 			<version>${org.slf4j.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>2.3.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.13</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/elasticsearch/src/main/java/com/baeldung/elasticsearch/Person.java b/spring-data-elasticsearch/src/main/java/com/baeldung/elasticsearch/Person.java
similarity index 94%
rename from elasticsearch/src/main/java/com/baeldung/elasticsearch/Person.java
rename to spring-data-elasticsearch/src/main/java/com/baeldung/elasticsearch/Person.java
index 8f0b19a186..b8ad59e2e2 100644
--- a/elasticsearch/src/main/java/com/baeldung/elasticsearch/Person.java
+++ b/spring-data-elasticsearch/src/main/java/com/baeldung/elasticsearch/Person.java
@@ -1,52 +1,52 @@
-package com.baeldung.elasticsearch;
-
-import java.util.Date;
-
-public class Person {
-
-    private int age;
-
-    private String fullName;
-
-    private Date dateOfBirth;
-
-    public Person() {
-
-    }
-
-    public Person(int age, String fullName, Date dateOfBirth) {
-        super();
-        this.age = age;
-        this.fullName = fullName;
-        this.dateOfBirth = dateOfBirth;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public String getFullName() {
-        return fullName;
-    }
-
-    public void setFullName(String fullName) {
-        this.fullName = fullName;
-    }
-
-    public Date getDateOfBirth() {
-        return dateOfBirth;
-    }
-
-    public void setDateOfBirth(Date dateOfBirth) {
-        this.dateOfBirth = dateOfBirth;
-    }
-
-    @Override
-    public String toString() {
-        return "Person [age=" + age + ", fullName=" + fullName + ", dateOfBirth=" + dateOfBirth + "]";
-    }
-}
+package com.baeldung.elasticsearch;
+
+import java.util.Date;
+
+public class Person {
+
+    private int age;
+
+    private String fullName;
+
+    private Date dateOfBirth;
+
+    public Person() {
+
+    }
+
+    public Person(int age, String fullName, Date dateOfBirth) {
+        super();
+        this.age = age;
+        this.fullName = fullName;
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public Date getDateOfBirth() {
+        return dateOfBirth;
+    }
+
+    public void setDateOfBirth(Date dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    @Override
+    public String toString() {
+        return "Person [age=" + age + ", fullName=" + fullName + ", dateOfBirth=" + dateOfBirth + "]";
+    }
+}
diff --git a/elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java b/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java
similarity index 100%
rename from elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java
rename to spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java