diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe74ee07..3464d4b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add Groovy console to the Tools menu [#56](https://github.com/orbinson/aem-groovy-console/issues/56)
+
 ### Changed
 
 -  Remove all dependencies on Guava [#62](https://github.com/orbinson/aem-groovy-console/issues/62)
+-  Fix Cloud pipeline package Overlap Issue [#52](https://github.com/orbinson/aem-groovy-console/issues/52)
 
 ## [19.0.5] - 2024-02-10
 
diff --git a/all/pom.xml b/all/pom.xml
index 092262e7..4ffa0bf4 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -37,6 +37,8 @@
                     <properties>
                         <cloudManagerTarget>all</cloudManagerTarget>
                     </properties>
+                    <!-- all sub packages have been validated already -->
+                    <skipSubPackageValidation>true</skipSubPackageValidation>
                     <embeddeds>
                         <embedded>
                             <groupId>be.orbinson.aem</groupId>
diff --git a/pom.xml b/pom.xml
index 6a174ed0..489dbe9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
         <module>groovy</module>
         <module>ui.apps</module>
         <module>ui.apps.aem</module>
-        <module>ui.apps.structure</module>
         <module>ui.config</module>
         <module>ui.content</module>
     </modules>
@@ -349,7 +348,7 @@
                     <groupId>org.apache.jackrabbit</groupId>
                     <artifactId>filevault-package-maven-plugin</artifactId>
                     <extensions>true</extensions>
-                    <version>1.1.4</version>
+                    <version>1.3.6</version>
                     <configuration>
                         <filterSource>src/main/content/META-INF/vault/filter.xml</filterSource>
                         <properties>
diff --git a/ui.apps.aem/pom.xml b/ui.apps.aem/pom.xml
index 2d776551..7dc0cfe0 100644
--- a/ui.apps.aem/pom.xml
+++ b/ui.apps.aem/pom.xml
@@ -23,7 +23,6 @@
                     <group>${project.artifactId}</group>
                     <name>aem-groovy-console-ui.apps.aem</name>
                     <packageType>application</packageType>
-                    <accessControlHandling>merge</accessControlHandling>
                     <properties>
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>
@@ -36,12 +35,17 @@
                     <validatorsSettings>
                         <jackrabbit-filter>
                             <options>
-                                <validRoots>/apps/groovyconsole/components/console</validRoots>
+                                <validRoots>/apps,/apps/cq/core/content</validRoots>
                             </options>
                         </jackrabbit-filter>
                         <jackrabbit-nodetypes>
                             <isDisabled>true</isDisabled>
                         </jackrabbit-nodetypes>
+                        <jackrabbit-packagetype>
+                            <options>
+                                <allowComplexFilterRulesInApplicationPackages>true</allowComplexFilterRulesInApplicationPackages>
+                            </options>
+                        </jackrabbit-packagetype>
                     </validatorsSettings>
                 </configuration>
             </plugin>
diff --git a/ui.apps.aem/src/main/content/META-INF/vault/filter.xml b/ui.apps.aem/src/main/content/META-INF/vault/filter.xml
index 6c41ee66..1db202d2 100644
--- a/ui.apps.aem/src/main/content/META-INF/vault/filter.xml
+++ b/ui.apps.aem/src/main/content/META-INF/vault/filter.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
-    <filter root="/apps/groovyconsole/clientlibs-aem"/>
-    <filter root="/apps/groovyconsole/components/console/opendialog"/>
-    <filter root="/apps/groovyconsole/components/console/savedialog"/>
+    <filter root="/apps/groovyconsole-aem"/>
+
+    <filter root="/apps/cq/core/content/nav">
+        <include pattern="/apps/cq/core/content/nav"/>
+        <include pattern="/apps/cq/core/content/nav/tools"/>
+        <include pattern="/apps/cq/core/content/nav/tools/general"/>
+        <include pattern="/apps/cq/core/content/nav/tools/general/groovyconsole(.*)?"/>
+    </filter>
 </workspaceFilter>
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/cq/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/cq/.content.xml
new file mode 100644
index 00000000..160edce6
--- /dev/null
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/cq/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="sling:OrderedFolder"/>
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/.content.xml
new file mode 100644
index 00000000..160edce6
--- /dev/null
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="sling:OrderedFolder"/>
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/.content.xml
new file mode 100644
index 00000000..160edce6
--- /dev/null
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="sling:OrderedFolder"/>
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/tools/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/tools/.content.xml
new file mode 100644
index 00000000..160edce6
--- /dev/null
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/tools/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="sling:OrderedFolder"/>
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/tools/general/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/tools/general/.content.xml
new file mode 100644
index 00000000..85d9cdf4
--- /dev/null
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/tools/general/.content.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          jcr:primaryType="sling:OrderedFolder">
+</jcr:root>
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/tools/general/groovyconsole/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/tools/general/groovyconsole/.content.xml
new file mode 100644
index 00000000..99147d6e
--- /dev/null
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/cq/core/content/nav/tools/general/groovyconsole/.content.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:description="The AEM Groovy Console provides an interface for running Groovy scripts"
+          jcr:primaryType="nt:unstructured"
+          jcr:title="AEM Groovy Console"
+          href="/apps/groovyconsole.html"
+          icon="actions"
+          id="granite-general-groovyconsole">
+</jcr:root>
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/components/console/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/.content.xml
similarity index 73%
rename from ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/components/console/.content.xml
rename to ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/.content.xml
index 7da43861..e562a806 100644
--- a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/components/console/.content.xml
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/.content.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
           xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          jcr:primaryType="sling:Folder"/>
\ No newline at end of file
+          jcr:primaryType="sling:Folder">
+</jcr:root>
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/clientlibs-aem/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/clientlibs/.content.xml
similarity index 87%
rename from ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/clientlibs-aem/.content.xml
rename to ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/clientlibs/.content.xml
index 693a88bf..0b23848d 100644
--- a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/clientlibs-aem/.content.xml
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/clientlibs/.content.xml
@@ -4,4 +4,4 @@
           jcr:primaryType="cq:ClientLibraryFolder"
           categories="[groovyconsole]"
           allowProxy="{Boolean}true"
-          dependencies="[cq.shared]"/>
\ No newline at end of file
+          dependencies="[cq.shared]"/>
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/clientlibs-aem/css.txt b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/clientlibs/css.txt
similarity index 56%
rename from ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/clientlibs-aem/css.txt
rename to ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/clientlibs/css.txt
index 06ff4bbd..95f0290d 100644
--- a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/clientlibs-aem/css.txt
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/clientlibs/css.txt
@@ -1,7 +1,7 @@
-#base=../clientlibs/css
+#base=/apps/groovyconsole/clientlibs/css
 
 bootstrap.css
 bootstrap-theme.css
 daterangepicker.css
 datatables.css
-console.css
\ No newline at end of file
+console.css
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/clientlibs-aem/js.txt b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/clientlibs/js.txt
similarity index 94%
rename from ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/clientlibs-aem/js.txt
rename to ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/clientlibs/js.txt
index 04b42024..11074ac9 100644
--- a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/clientlibs-aem/js.txt
+++ b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/clientlibs/js.txt
@@ -1,4 +1,4 @@
-#base=../clientlibs/js
+#base=/apps/groovyconsole/clientlibs/js
 
 datatables.js
 jquery-ui.min.js
@@ -53,4 +53,4 @@ console.js
 services.js
 audit.js
 scheduled-jobs.js
-local-storage.js
\ No newline at end of file
+local-storage.js
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/components/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/dialogs/.content.xml
similarity index 100%
rename from ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/components/.content.xml
rename to ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/dialogs/.content.xml
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/components/console/opendialog.xml b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/dialogs/opendialog.xml
similarity index 100%
rename from ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/components/console/opendialog.xml
rename to ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/dialogs/opendialog.xml
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/components/console/savedialog.xml b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/dialogs/savedialog.xml
similarity index 100%
rename from ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/components/console/savedialog.xml
rename to ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole-aem/dialogs/savedialog.xml
diff --git a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/.content.xml b/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/.content.xml
deleted file mode 100644
index 5cf274c8..00000000
--- a/ui.apps.aem/src/main/content/jcr_root/apps/groovyconsole/.content.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
-          xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          jcr:primaryType="sling:Folder"
-          jcr:title="Groovy Console"
-          sling:resourceType="groovyconsole/components/console"
-          sling:vanityPath="/groovyconsole">
-</jcr:root>
diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml
deleted file mode 100644
index 59d904d3..00000000
--- a/ui.apps.structure/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>be.orbinson.aem</groupId>
-        <artifactId>aem-groovy-console</artifactId>
-        <version>19.0.6-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>aem-groovy-console-ui.apps.structure</artifactId>
-    <packaging>content-package</packaging>
-    <name>AEM Groovy Console - Repository Structure Package</name>
-    <description>
-        Empty package that defines the structure of the Adobe Experience Manager repository the Code packages in this project deploy into.
-        Any roots in the Code packages of this project should have their parent enumerated in the Filters list below.
-    </description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.jackrabbit</groupId>
-                <artifactId>filevault-package-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <properties>
-                        <cloudManagerTarget>none</cloudManagerTarget>
-                    </properties>
-                    <filters>
-                        <filter><root>/apps</root></filter>
-                        <filter><root>/apps/groovyconsole</root></filter>
-                    </filters>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 3863c5b1..6ec0a024 100644
--- a/ui.apps/pom.xml
+++ b/ui.apps/pom.xml
@@ -23,16 +23,9 @@
                     <group>${project.artifactId}</group>
                     <name>aem-groovy-console-ui.apps</name>
                     <packageType>application</packageType>
-                    <accessControlHandling>merge</accessControlHandling>
                     <properties>
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>
-                    <repositoryStructurePackages>
-                        <repositoryStructurePackage>
-                            <groupId>be.orbinson.aem</groupId>
-                            <artifactId>aem-groovy-console-ui.apps.structure</artifactId>
-                        </repositoryStructurePackage>
-                    </repositoryStructurePackages>
                     <validatorsSettings>
                         <jackrabbit-nodetypes>
                             <isDisabled>true</isDisabled>
diff --git a/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/.content.xml b/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/.content.xml
index 7003710b..75610a9f 100644
--- a/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/.content.xml
@@ -2,4 +2,4 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
           jcr:primaryType="sling:OrderedFolder"
           sling:resourceType="composum/nodes/commons/clientlib"
-          category="[groovyconsole]"/>
\ No newline at end of file
+          category="[groovyconsole]"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/js/console.js b/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/js/console.js
index f258969e..b6a03825 100644
--- a/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/js/console.js
+++ b/ui.apps/src/main/content/jcr_root/apps/groovyconsole/clientlibs/js/console.js
@@ -540,15 +540,23 @@ var GroovyConsole = function () {
     },
 
     showOpenDialog: function () {
-      var dialog = CQ.WCM.getDialog('/apps/groovyconsole/components/console/opendialog');
+      if (typeof CQ !== undefined) {
+        var dialog = CQ.WCM.getDialog('/apps/groovyconsole-aem/dialogs/opendialog');
 
-      dialog.show();
+        dialog.show();
+      } else {
+        alert("Open and saving currently only supported in AEM")
+      }
     },
 
     showSaveDialog: function () {
-      var dialog = CQ.WCM.getDialog('/apps/groovyconsole/components/console/savedialog');
+        if (typeof CQ !== undefined) {
+            var dialog = CQ.WCM.getDialog('/apps/groovyconsole-aem/dialogs/savedialog');
 
-      dialog.show();
+            dialog.show();
+        } else {
+            alert("Open and saving currently only supported in AEM")
+        }
     },
 
     loadScript: function (scriptPath) {
diff --git a/ui.content/pom.xml b/ui.content/pom.xml
index 69c23969..94f4e9ca 100644
--- a/ui.content/pom.xml
+++ b/ui.content/pom.xml
@@ -23,7 +23,6 @@
                     <group>${project.artifactId}</group>
                     <name>aem-groovy-console-ui.content</name>
                     <packageType>content</packageType>
-                    <accessControlHandling>merge</accessControlHandling>
                     <properties>
                         <cloudManagerTarget>none</cloudManagerTarget>
                     </properties>