diff --git a/libraries-data/ebean/pom.xml b/libraries-data/ebean/pom.xml
deleted file mode 100644
index 2e319e1523..0000000000
--- a/libraries-data/ebean/pom.xml
+++ /dev/null
@@ -1,59 +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>ebean</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>ebean</name>
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.ebean</groupId>
-            <artifactId>ebean</artifactId>
-            <version>11.22.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.196</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <!-- Need to fix this pluginManagement -->
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>io.ebean</groupId>
-                    <artifactId>ebean-maven-plugin</artifactId>
-                    <version>11.11.2</version>
-                    <executions>
-                        <!-- enhance main classes -->
-                        <execution>
-                            <id>main</id>
-                            <phase>process-classes</phase>
-                            <configuration>
-                                <transformArgs>debug=1</transformArgs>
-                            </configuration>
-                            <goals>
-                                <goal>enhance</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 5b34a903ce..abbbe9c5de 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -249,6 +249,18 @@
             <version>${awaitility.version}</version>
             <scope>test</scope>
         </dependency>
+		
+		<dependency>
+            <groupId>io.ebean</groupId>
+            <artifactId>ebean</artifactId>
+            <version>11.22.4</version>
+        </dependency>
+       
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+        </dependency>
 
     </dependencies>
 
@@ -332,27 +344,7 @@
             <!-- /Reladomo -->
 
             <!-- JDO Plugin -->
-            <plugin>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>datanucleus-maven-plugin</artifactId>
-                <version>${datanucleus-maven-plugin.version}</version>
-                <configuration>
-                    <api>JDO</api>
-                    <props>${basedir}/datanucleus.properties</props>
-                    <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                    <verbose>true</verbose>
-                    <fork>false</fork>
-                    <!-- Solve windows line too long error -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>enhance</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+           
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -380,6 +372,28 @@
 			</plugin>
 
         </plugins>
+		<pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>io.ebean</groupId>
+                    <artifactId>ebean-maven-plugin</artifactId>
+                    <version>11.11.2</version>
+                    <executions>
+                        <!-- enhance main classes -->
+                        <execution>
+                            <id>main</id>
+                            <phase>process-classes</phase>
+                            <configuration>
+                                <transformArgs>debug=1</transformArgs>
+                            </configuration>
+                            <goals>
+                                <goal>enhance</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <repositories>
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App.java b/libraries-data/src/main/java/com/baeldung/ebean/app/App.java
similarity index 100%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App.java
rename to libraries-data/src/main/java/com/baeldung/ebean/app/App.java
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App2.java b/libraries-data/src/main/java/com/baeldung/ebean/app/App2.java
similarity index 100%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/app/App2.java
rename to libraries-data/src/main/java/com/baeldung/ebean/app/App2.java
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Address.java b/libraries-data/src/main/java/com/baeldung/ebean/model/Address.java
similarity index 100%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Address.java
rename to libraries-data/src/main/java/com/baeldung/ebean/model/Address.java
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java b/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
similarity index 94%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java
rename to libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
index 7634df7aa0..1390507605 100644
--- a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/BaseModel.java
+++ b/libraries-data/src/main/java/com/baeldung/ebean/model/BaseModel.java
@@ -1,59 +1,59 @@
-package com.baeldung.ebean.model;
-
-import java.time.Instant;
-
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Version;
-
-import io.ebean.annotation.WhenCreated;
-import io.ebean.annotation.WhenModified;
-
-@MappedSuperclass
-public abstract class BaseModel {
-
-    @Id
-    protected long id;
-    
-    @Version
-    protected long version;
-    
-    @WhenCreated
-    protected Instant createdOn;
-    
-    @WhenModified
-    protected Instant modifiedOn;
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Instant getCreatedOn() {
-        return createdOn;
-    }
-
-    public void setCreatedOn(Instant createdOn) {
-        this.createdOn = createdOn;
-    }
-
-    public Instant getModifiedOn() {
-        return modifiedOn;
-    }
-
-    public void setModifiedOn(Instant modifiedOn) {
-        this.modifiedOn = modifiedOn;
-    }
-
-    public long getVersion() {
-        return version;
-    }
-
-    public void setVersion(long version) {
-        this.version = version;
-    }
-    
-}
+package com.baeldung.ebean.model;
+
+import java.time.Instant;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+
+import io.ebean.annotation.WhenCreated;
+import io.ebean.annotation.WhenModified;
+
+@MappedSuperclass
+public abstract class BaseModel {
+
+    @Id
+    protected long id;
+    
+    @Version
+    protected long version;
+    
+    @WhenCreated
+    protected Instant createdOn;
+    
+    @WhenModified
+    protected Instant modifiedOn;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public Instant getCreatedOn() {
+        return createdOn;
+    }
+
+    public void setCreatedOn(Instant createdOn) {
+        this.createdOn = createdOn;
+    }
+
+    public Instant getModifiedOn() {
+        return modifiedOn;
+    }
+
+    public void setModifiedOn(Instant modifiedOn) {
+        this.modifiedOn = modifiedOn;
+    }
+
+    public long getVersion() {
+        return version;
+    }
+
+    public void setVersion(long version) {
+        this.version = version;
+    }
+    
+}
diff --git a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java b/libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java
similarity index 95%
rename from libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java
rename to libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java
index df1db82de4..4dd629245a 100644
--- a/libraries-data/ebean/src/main/java/com/baeldung/ebean/model/Customer.java
+++ b/libraries-data/src/main/java/com/baeldung/ebean/model/Customer.java
@@ -1,42 +1,42 @@
-package com.baeldung.ebean.model;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.OneToOne;
-
-@Entity
-public class Customer extends BaseModel {
-
-    public Customer(String name, Address address) {
-        super();
-        this.name = name;
-        this.address = address;
-    }
-
-    private String name;
-
-    @OneToOne(cascade = CascadeType.ALL)
-    Address address;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Address getAddress() {
-        return address;
-    }
-
-    public void setAddress(Address address) {
-        this.address = address;
-    }
-
-    @Override
-    public String toString() {
-        return "Customer [id=" + id + ", name=" + name + ", address=" + address + "]";
-    }
-
-}
+package com.baeldung.ebean.model;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+
+@Entity
+public class Customer extends BaseModel {
+
+    public Customer(String name, Address address) {
+        super();
+        this.name = name;
+        this.address = address;
+    }
+
+    private String name;
+
+    @OneToOne(cascade = CascadeType.ALL)
+    Address address;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+
+    @Override
+    public String toString() {
+        return "Customer [id=" + id + ", name=" + name + ", address=" + address + "]";
+    }
+
+}
diff --git a/libraries-data/ebean/src/main/resources/application.properties b/libraries-data/src/main/resources/application.properties
similarity index 100%
rename from libraries-data/ebean/src/main/resources/application.properties
rename to libraries-data/src/main/resources/application.properties
diff --git a/libraries-data/ebean/src/main/resources/ebean.mf b/libraries-data/src/main/resources/ebean.mf
similarity index 100%
rename from libraries-data/ebean/src/main/resources/ebean.mf
rename to libraries-data/src/main/resources/ebean.mf
diff --git a/libraries-data/ebean/src/main/resources/logback.yml b/libraries-data/src/main/resources/logback.yml
similarity index 100%
rename from libraries-data/ebean/src/main/resources/logback.yml
rename to libraries-data/src/main/resources/logback.yml