diff --git a/libraries-3/pom.xml b/libraries-3/pom.xml
index dded3d5b7e21..5f3454ecf74b 100644
--- a/libraries-3/pom.xml
+++ b/libraries-3/pom.xml
@@ -70,36 +70,6 @@
             <artifactId>error_prone_core</artifactId>
             <version>${errorprone.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.structurizr</groupId>
-            <artifactId>structurizr-core</artifactId>
-            <version>${structurizr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.structurizr</groupId>
-            <artifactId>structurizr-spring</artifactId>
-            <version>${structurizr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.structurizr</groupId>
-            <artifactId>structurizr-client</artifactId>
-            <version>${structurizr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.structurizr</groupId>
-            <artifactId>structurizr-analysis</artifactId>
-            <version>${structurizr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.structurizr</groupId>
-            <artifactId>structurizr-plantuml</artifactId>
-            <version>${structurizr.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax.annotation-api.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.javers</groupId>
             <artifactId>javers-core</artifactId>
@@ -195,12 +165,6 @@
                 </executions>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/webapp</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
     </build>
 
     <properties>
@@ -208,8 +172,6 @@
         <nullaway.version>0.3.0</nullaway.version>
         <plexus-compiler.version>2.8</plexus-compiler.version>
         <errorprone.version>2.1.3</errorprone.version>
-        <structurizr.version>1.0.0</structurizr.version>
-        <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <javers.version>3.1.0</javers.version>
         <sbe-tool.version>1.27.0</sbe-tool.version>
         <agrona.version>1.17.1</agrona.version>
diff --git a/libraries-6/pom.xml b/libraries-6/pom.xml
index b3ae0eef9235..8ea498b5a59a 100644
--- a/libraries-6/pom.xml
+++ b/libraries-6/pom.xml
@@ -48,6 +48,36 @@
             <artifactId>functionaljava-java8</artifactId>
             <version>${functionaljava.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.structurizr</groupId>
+            <artifactId>structurizr-core</artifactId>
+            <version>${structurizr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.structurizr</groupId>
+            <artifactId>structurizr-spring</artifactId>
+            <version>${structurizr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.structurizr</groupId>
+            <artifactId>structurizr-client</artifactId>
+            <version>${structurizr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.structurizr</groupId>
+            <artifactId>structurizr-analysis</artifactId>
+            <version>${structurizr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.structurizr</groupId>
+            <artifactId>structurizr-plantuml</artifactId>
+            <version>${structurizr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax.annotation-api.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -90,6 +120,8 @@
         <aspectjweaver.version>1.9.20.1</aspectjweaver.version>
         <java-lsh.version>0.10</java-lsh.version>
         <functionaljava.version>4.8.1</functionaljava.version>
+        <structurizr.version>1.0.0</structurizr.version>
+        <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
     </properties>
 
 </project>
diff --git a/libraries-3/src/main/java/com/baeldung/structurizr/StructurizrSimple.java b/libraries-6/src/main/java/com/baeldung/structurizr/StructurizrSimple.java
similarity index 100%
rename from libraries-3/src/main/java/com/baeldung/structurizr/StructurizrSimple.java
rename to libraries-6/src/main/java/com/baeldung/structurizr/StructurizrSimple.java
diff --git a/libraries-3/src/main/java/com/baeldung/structurizr/spring/GenericComponent.java b/libraries-6/src/main/java/com/baeldung/structurizr/spring/GenericComponent.java
similarity index 100%
rename from libraries-3/src/main/java/com/baeldung/structurizr/spring/GenericComponent.java
rename to libraries-6/src/main/java/com/baeldung/structurizr/spring/GenericComponent.java
diff --git a/libraries-3/src/main/java/com/baeldung/structurizr/spring/PaymentController.java b/libraries-6/src/main/java/com/baeldung/structurizr/spring/PaymentController.java
similarity index 100%
rename from libraries-3/src/main/java/com/baeldung/structurizr/spring/PaymentController.java
rename to libraries-6/src/main/java/com/baeldung/structurizr/spring/PaymentController.java
diff --git a/libraries-3/src/main/java/com/baeldung/structurizr/spring/PaymentRepository.java b/libraries-6/src/main/java/com/baeldung/structurizr/spring/PaymentRepository.java
similarity index 100%
rename from libraries-3/src/main/java/com/baeldung/structurizr/spring/PaymentRepository.java
rename to libraries-6/src/main/java/com/baeldung/structurizr/spring/PaymentRepository.java