diff --git a/libraries-2/README.md b/libraries-2/README.md
index 400aa475d1..a9f0e86a5f 100644
--- a/libraries-2/README.md
+++ b/libraries-2/README.md
@@ -11,3 +11,4 @@
 - [Matrix Multiplication in Java](https://www.baeldung.com/java-matrix-multiplication)
 - [Guide to MapDB](https://www.baeldung.com/mapdb)
 - [A Guide to Apache Mesos](https://www.baeldung.com/apache-mesos)
+- [JasperReports with Spring](http://www.baeldung.com/spring-jasper)
\ No newline at end of file
diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml
index 708006fa15..1ffaf0bbd7 100644
--- a/libraries-2/pom.xml
+++ b/libraries-2/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-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/xsd/maven-4.0.0.xsd">
+         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>
     <artifactId>libraries-2</artifactId>
     <name>libraries-2</name>
@@ -112,10 +112,36 @@
             <artifactId>mesos</artifactId>
             <version>${mesos.library.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.sf.jasperreports</groupId>
+            <artifactId>jasperreports</artifactId>
+            <version>${jasperreports.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>${hsqldb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
-	    <mapdb.version>3.0.7</mapdb.version>
+        <mapdb.version>3.0.7</mapdb.version>
         <assertj.version>3.6.2</assertj.version>
         <classgraph.version>4.8.28</classgraph.version>
         <jbpm.version>6.0.0.Final</jbpm.version>
@@ -129,5 +155,8 @@
         <gson.version>2.8.5</gson.version>
         <mockwebserver.version>3.14.2</mockwebserver.version>
         <handlebars.version>4.1.2</handlebars.version>
+        <jasperreports.version>6.6.0</jasperreports.version>
+        <spring.version>5.1.9.RELEASE</spring.version>
+        <hsqldb.version>2.5.0</hsqldb.version>
     </properties>
 </project>
diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/Main.java b/libraries-2/src/main/java/com/baeldung/jasperreports/Main.java
similarity index 93%
rename from spring-all/src/main/java/org/baeldung/jasperreports/Main.java
rename to libraries-2/src/main/java/com/baeldung/jasperreports/Main.java
index 79aee100a6..1c75c161fb 100644
--- a/spring-all/src/main/java/org/baeldung/jasperreports/Main.java
+++ b/libraries-2/src/main/java/com/baeldung/jasperreports/Main.java
@@ -1,9 +1,10 @@
-package org.baeldung.jasperreports;
+package com.baeldung.jasperreports;
+
+import com.baeldung.jasperreports.config.JasperRerportsSimpleConfig;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.baeldung.jasperreports.config.JasperRerportsSimpleConfig;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 public class Main {
     public static void main(String[] args) {
diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java b/libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportExporter.java
similarity index 87%
rename from spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java
rename to libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportExporter.java
index 103bb37eb4..fa4b25707b 100644
--- a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java
+++ b/libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportExporter.java
@@ -1,22 +1,17 @@
-package org.baeldung.jasperreports;
+package com.baeldung.jasperreports;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.export.HtmlExporter;
 import net.sf.jasperreports.engine.export.JRCsvExporter;
 import net.sf.jasperreports.engine.export.JRPdfExporter;
 import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
-import net.sf.jasperreports.export.SimpleExporterInput;
-import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
-import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
-import net.sf.jasperreports.export.SimplePdfExporterConfiguration;
-import net.sf.jasperreports.export.SimplePdfReportConfiguration;
-import net.sf.jasperreports.export.SimpleWriterExporterOutput;
-import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
+import net.sf.jasperreports.export.*;
 import org.springframework.stereotype.Component;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 @Component
 public class SimpleReportExporter {
 
diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java b/libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportFiller.java
similarity index 88%
rename from spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java
rename to libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportFiller.java
index 08891d940a..5f0f7e1345 100644
--- a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java
+++ b/libraries-2/src/main/java/com/baeldung/jasperreports/SimpleReportFiller.java
@@ -1,20 +1,17 @@
-package org.baeldung.jasperreports;
+package com.baeldung.jasperreports;
 
+import net.sf.jasperreports.engine.*;
+import net.sf.jasperreports.engine.util.JRSaver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
 import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.sql.DataSource;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JasperCompileManager;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.util.JRSaver;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 @Component
 public class SimpleReportFiller {
diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java b/libraries-2/src/main/java/com/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
similarity index 83%
rename from spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
rename to libraries-2/src/main/java/com/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
index 5cc2d894c9..10bae0052f 100644
--- a/spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
+++ b/libraries-2/src/main/java/com/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java
@@ -1,13 +1,14 @@
-package org.baeldung.jasperreports.config;
+package com.baeldung.jasperreports.config;
 
-import javax.sql.DataSource;
-import org.baeldung.jasperreports.SimpleReportExporter;
-import org.baeldung.jasperreports.SimpleReportFiller;
+import com.baeldung.jasperreports.SimpleReportExporter;
+import com.baeldung.jasperreports.SimpleReportFiller;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
+import javax.sql.DataSource;
+
 @Configuration
 public class JasperRerportsSimpleConfig {
 
diff --git a/spring-all/src/main/resources/employee-schema.sql b/libraries-2/src/main/resources/employee-schema.sql
similarity index 100%
rename from spring-all/src/main/resources/employee-schema.sql
rename to libraries-2/src/main/resources/employee-schema.sql
diff --git a/spring-all/src/main/resources/employeeEmailReport.jrxml b/libraries-2/src/main/resources/employeeEmailReport.jrxml
similarity index 100%
rename from spring-all/src/main/resources/employeeEmailReport.jrxml
rename to libraries-2/src/main/resources/employeeEmailReport.jrxml
diff --git a/spring-all/src/main/resources/employeeReport.jrxml b/libraries-2/src/main/resources/employeeReport.jrxml
similarity index 100%
rename from spring-all/src/main/resources/employeeReport.jrxml
rename to libraries-2/src/main/resources/employeeReport.jrxml
diff --git a/spring-all/README.md b/spring-all/README.md
index 96572c1d0e..16da3bc8a1 100644
--- a/spring-all/README.md
+++ b/spring-all/README.md
@@ -18,9 +18,8 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
 - [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
 - [A CLI with Spring Shell](http://www.baeldung.com/spring-shell-cli)
-- [JasperReports with Spring](http://www.baeldung.com/spring-jasper)
 - [@Order in Spring](http://www.baeldung.com/spring-order)
 - [Spring @Primary Annotation](http://www.baeldung.com/spring-primary)
 - [Spring Events](https://www.baeldung.com/spring-events)
 - [Spring Null-Safety Annotations](https://www.baeldung.com/spring-null-safety-annotations)
-- [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class)
+- [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class)
\ No newline at end of file