diff --git a/core-java/pom.xml b/core-java/pom.xml
index 2267dba1e6..84a56c8bc7 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -327,6 +327,22 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.6.0</version>
+                <configuration>
+                    <executable>java</executable>
+                    <mainClass>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</mainClass>
+                    <arguments>
+                        <argument>-Xmx300m</argument>
+                        <argument>-XX:+UseParallelGC</argument>
+                        <argument>-classpath</argument>
+                        <classpath/>
+                        <argument>com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>
diff --git a/core-java/src/main/java/com/baeldung/outofmemoryerror/java-outofmemoryerror-demo/src/main/java/com/baeldung/outofmemoryerror/java_outofmemoryerror_demo/OutOfMemoryGCLimitExceed.java b/core-java/src/main/java/com/baeldung/outofmemoryerror/OutOfMemoryGCLimitExceed.java
similarity index 50%
rename from core-java/src/main/java/com/baeldung/outofmemoryerror/java-outofmemoryerror-demo/src/main/java/com/baeldung/outofmemoryerror/java_outofmemoryerror_demo/OutOfMemoryGCLimitExceed.java
rename to core-java/src/main/java/com/baeldung/outofmemoryerror/OutOfMemoryGCLimitExceed.java
index 65b7950964..a1b4140281 100644
--- a/core-java/src/main/java/com/baeldung/outofmemoryerror/java-outofmemoryerror-demo/src/main/java/com/baeldung/outofmemoryerror/java_outofmemoryerror_demo/OutOfMemoryGCLimitExceed.java
+++ b/core-java/src/main/java/com/baeldung/outofmemoryerror/OutOfMemoryGCLimitExceed.java
@@ -1,15 +1,19 @@
-package com.baeldung.outofmemoryerror.java_outofmemoryerror_demo;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-public class OutOfMemoryGCLimitExceed { 
-    public static void addRandomDataToMap() {
-        Map<Integer, String> dataMap = new HashMap<Integer,String>();
-        Random r = new Random();
-        while (true) {
-            dataMap.put(r.nextInt(), String.valueOf(r.nextInt()));
-        }  
-    }
-}
+package com.baeldung.outofmemoryerror;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+public class OutOfMemoryGCLimitExceed {
+    public static void addRandomDataToMap() {
+        Map<Integer, String> dataMap = new HashMap<>();
+        Random r = new Random();
+        while (true) {
+            dataMap.put(r.nextInt(), String.valueOf(r.nextInt()));
+        }
+    }
+
+    public static void main(String[] args) {
+        OutOfMemoryGCLimitExceed.addRandomDataToMap();
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/outofmemoryerror/java-outofmemoryerror-demo/pom.xml b/core-java/src/main/java/com/baeldung/outofmemoryerror/java-outofmemoryerror-demo/pom.xml
deleted file mode 100644
index 68a2877284..0000000000
--- a/core-java/src/main/java/com/baeldung/outofmemoryerror/java-outofmemoryerror-demo/pom.xml
+++ /dev/null
@@ -1,44 +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.outofmemoryerror</groupId>
-  <artifactId>java-outofmemoryerror-demo</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <name>java-outofmemoryerror-demo</name>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <build>
-   <plugins>
-	   <plugin>
-	        <groupId>org.codehaus.mojo</groupId>
-	        <artifactId>exec-maven-plugin</artifactId>
-	        <version>1.2</version>
-	        <configuration>
-	          <executable>java</executable>
-	          <arguments>
-	            <argument>-Xmx100m</argument>
-	            <argument>-XX:+UseParallelGC</argument>
-	            <argument>-classpath</argument>
-	            <classpath/>
-	            <argument>com.baeldung.outofmemoryerror.java_outofmemoryerror_demo.Test</argument>
-	          </arguments>
-	        </configuration>
-	      </plugin>
-   </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/core-java/src/main/java/com/baeldung/outofmemoryerror/java-outofmemoryerror-demo/src/main/java/com/baeldung/outofmemoryerror/java_outofmemoryerror_demo/Test.java b/core-java/src/main/java/com/baeldung/outofmemoryerror/java-outofmemoryerror-demo/src/main/java/com/baeldung/outofmemoryerror/java_outofmemoryerror_demo/Test.java
deleted file mode 100644
index dac1030255..0000000000
--- a/core-java/src/main/java/com/baeldung/outofmemoryerror/java-outofmemoryerror-demo/src/main/java/com/baeldung/outofmemoryerror/java_outofmemoryerror_demo/Test.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.baeldung.outofmemoryerror.java_outofmemoryerror_demo;
-
-public class Test {
-    public static void main( String[] args )
-    {
-        OutOfMemoryGCLimitExceed.addRandomDataToMap();
-    }
-}