diff --git a/src/main/content/META-INF/vault/filter.xml b/src/main/content/META-INF/vault/filter.xml
index dedf22a..b5c5e3e 100644
--- a/src/main/content/META-INF/vault/filter.xml
+++ b/src/main/content/META-INF/vault/filter.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <workspaceFilter version="1.0">
+	<filter root="/apps/cq/core/content/nav/tools/jcr-hopper" />
 	<filter root="/apps/jcr-hopper" />
 	<filter root="/etc/jcr-hopper" />
 </workspaceFilter>
diff --git a/src/main/content/jcr_root/apps/cq/core/content/.content.xml b/src/main/content/jcr_root/apps/cq/core/content/.content.xml
new file mode 100644
index 0000000..83ba2a0
--- /dev/null
+++ b/src/main/content/jcr_root/apps/cq/core/content/.content.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ JCR Hopper
+  ~ An Open Source Project from Swisscom
+  ~ 
+  ~ Copyright 2024 Swisscom (Schweiz) AG and contributors
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+<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" />
diff --git a/src/main/content/jcr_root/apps/cq/core/content/nav/.content.xml b/src/main/content/jcr_root/apps/cq/core/content/nav/.content.xml
new file mode 100644
index 0000000..7d24378
--- /dev/null
+++ b/src/main/content/jcr_root/apps/cq/core/content/nav/.content.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ JCR Hopper
+  ~ An Open Source Project from Swisscom
+  ~ 
+  ~ Copyright 2024 Swisscom (Schweiz) AG and contributors
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" jcr:primaryType="nt:unstructured" />
diff --git a/src/main/content/jcr_root/apps/cq/core/content/nav/tools/.content.xml b/src/main/content/jcr_root/apps/cq/core/content/nav/tools/.content.xml
new file mode 100644
index 0000000..de0f2f6
--- /dev/null
+++ b/src/main/content/jcr_root/apps/cq/core/content/nav/tools/.content.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ JCR Hopper
+  ~ An Open Source Project from Swisscom
+  ~ 
+  ~ Copyright 2024 Swisscom (Schweiz) AG and contributors
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" jcr:primaryType="nt:unstructured">
+	<jcr-hopper />
+</jcr:root>
diff --git a/src/main/content/jcr_root/apps/cq/core/content/nav/tools/jcr-hopper/.content.xml b/src/main/content/jcr_root/apps/cq/core/content/nav/tools/jcr-hopper/.content.xml
new file mode 100644
index 0000000..880cd27
--- /dev/null
+++ b/src/main/content/jcr_root/apps/cq/core/content/nav/tools/jcr-hopper/.content.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ JCR Hopper
+  ~ An Open Source Project from Swisscom
+  ~ 
+  ~ Copyright 2024 Swisscom (Schweiz) AG and contributors
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+<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:title="JCR Hopper"
+	id="com.swisscom.aem.tools.jcrhopper"
+>
+	<script-builder />
+</jcr:root>
diff --git a/src/main/content/jcr_root/apps/cq/core/content/nav/tools/jcr-hopper/script-builder/.content.xml b/src/main/content/jcr_root/apps/cq/core/content/nav/tools/jcr-hopper/script-builder/.content.xml
new file mode 100644
index 0000000..d578762
--- /dev/null
+++ b/src/main/content/jcr_root/apps/cq/core/content/nav/tools/jcr-hopper/script-builder/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ JCR Hopper
+  ~ An Open Source Project from Swisscom
+  ~ 
+  ~ Copyright 2024 Swisscom (Schweiz) AG and contributors
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+<jcr:root
+	xmlns:jcr="http://www.jcp.org/jcr/1.0"
+	jcr:primaryType="nt:unstructured"
+	jcr:title="Script Builder"
+	jcr:description="Migrate AEM with Grace."
+	icon="data:image/svg+xml;base64,PHN2ZyBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLW1pdGVybGltaXQ9IjIiIHZpZXdCb3g9IjAgMCA4MTggNzA2IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxnIHRyYW5zZm9ybT0ibWF0cml4KC45NjY3NDEgMCAwIC44NzUxODYgLTcyLjkxMzEgLTY3LjMzNTYpIj48cGF0aCBkPSJtNzUuNDIyIDc2LjkzOWg4NDUuMjE3djgwNi41MjFoLTg0NS4yMTd6IiBmaWxsPSJub25lIi8+PGcgc3Ryb2tlPSIjMDAwIiB0cmFuc2Zvcm09Im1hdHJpeCgzLjU3Mjk4IDAgMCAzLjk0Njc1IC0xNC4yMSAtMTg3LjczNCkiPjxwYXRoIGQ9Im01MS41NjEgMTQ5LjQzM2MtLjk0My0yOC4zMzMgMjcuMDk1LTY2LjI2MyAyNy4wOTUtNjYuMjYzczI0LjczOS0xMS40MjQgNjMuNjE0LTExLjQyNGMzOC44NzYgMCA2OC4zMjcgMTMuMDI0IDY4LjMyNyAxMy4wMjRzMjcuNTY2IDQyLjcyOCAyNy41NjYgNjMuOTc3YzAgMjEuMjUtMzkuODE4IDQwLjY3Mi0zOS44MTggNDAuNjcybC01Ni43ODIgNy41NC03MS44Ni0xOS4xOTN6IiBmaWxsPSIjZjJmMmYyIiBmaWxsLXJ1bGU9Im5vbnplcm8iIHN0cm9rZS13aWR0aD0iLjg3Ii8+PHBhdGggZD0ibTE0My4zOSAxMTQuMjU0YzM2LjkxNSAwIDgzLjc0NiAyNy40NTggODMuNzQ2IDI3LjQ1OGwtMjMuNDkyIDM5LjY2MS00Ni41MjUgMTUuMjU0LTMzLjQwNy0xLjgzLTM4LjI4OC0xMy43MjktMjEuMDUxLTI4Ljk4My00LjcyOS0xMC4yMjFzNDEuMDM0LTI3LjYxIDgzLjc0Ni0yNy42MXoiIGZpbGw9IiNmZmQ0MmEiIGZpbGwtcnVsZT0ibm9uemVybyIgc3Ryb2tlLXdpZHRoPSIuODciLz48cGF0aCBkPSJtMTk1Ljk3IDE0Ni4yNDFjMi4yOTEtMS43NzMgNC42MDgtMy42NjEgNi45NTItNS42NjMgMTIuNzcgMy41MDggMjAuNDYzIDcuMzEyIDIwLjQ2MyA3LjMxMnMtMjQuNDA4IDQ0LjY2MS04MC4yMzggNDQuNDY1Yy02NS4yMTEtLjIyOC03OC40MDYtNDUuOTkxLTc4LjQwNi00NS45OTFzNi4yNC0yLjUwOCAxNi44OS01LjMwNmMxLjk2OCAxLjU0MiAzLjkxNiAzLjAyIDUuODQ4IDQuNDMzdi0yNi41MTljMC03LjEyOSAyLjgzMi0xNi44NjEgNy44NzItMjEuOTAyIDUuMDQxLTUuMDQgMTcuMjAxLTE4LjM4MyA0NS4yNjYtMTguMzgzIDI4LjA2NiAwIDQyLjQ0IDEzLjM0MyA0Ny40OCAxOC4zODMgNS4wNDEgNS4wNDEgNy44NzMgMTQuNzczIDcuODczIDIxLjkwMnoiIGZpbGw9IiMzMzMiIHN0cm9rZS13aWR0aD0iLjg3Ii8+PHBhdGggZD0ibTE2NS42NjEgMjIyLjEwMiA1LjQ5MiA0My4wMTctNDEuNDkyLTMyLjk1eiIgZmlsbD0iIzBlMGUwZSIgZmlsbC1ydWxlPSJub256ZXJvIiBzdHJva2Utd2lkdGg9IjEuNDUiLz48ZyBzdHJva2Utd2lkdGg9Ii44NyI+PHBhdGggZD0ibTEyMy40NTkgMjI5LjE0OWMtODkuNDc0LTUuNTYtOTYuMDYyLTQ4LjA4Ny05Ni4wNjItNTkuMzcxIDAtMTIuMDgxIDExLjg2NS00My41NzcgMjAuMDYzLTQzLjU3NyAyMC4yNzggMCAxNi42ODcgNjUuNTA3IDk1LjQyOCA2NS41MDcgNzMuOTk0IDAgNzguODgtNjQuODYgOTcuODY0LTY0Ljg2IDMuNjY3IDAgMTguNzY4IDI4LjQ3NiAxOC43NjggNDQuNjU1IDAgMTUuMTQxLTYuMjM0IDUyLjk1My05Ni4xMzkgNTcuNzQ1LTcuNDAzIDIwLjA2NS01MS4xMSAzNy43MDEtNTEuMTEgMzcuNzAxczkuMTM2LTE5LjcxNCAxMS4xODgtMzcuOHoiIGZpbGw9IiMxYTFhNDIiLz48cGF0aCBkPSJtNzcuODcyIDE0NS45NDljNS4wMzQuMTUzIDQuNDI1IDIuMjg4IDEwLjgzMiAxMi4zNTYgMi43MzQgNC4yOTYgNy40MzggNi4zOTQgMTEuOTM2IDcuMzkyLTkuMDQtMy4yNTYtMTEuNzExLTEyLjAzNS0xMS40NzktMTIuNzMuMzA1LS45MTUgMy4yMDMtMS44MzIgNC43MjktLjc2NCAxLjUyNSAxLjA2OC42MDkgNC44ODIgNC44OCA5Ljc2NCAxLjcwMyAxLjk0NiA0LjAzNyAzLjA5MSA2LjIyNyAzLjc2NSA0LjgyMy0xLjc2NyAxMi4yMTktMS40MzEgMTMuNzU4LTEuMDIxIDIuMjg4LjYxIDEuMzczIDIuMTM2IDIuODk4IDIuNzQ2IDEuNTI2LjYxIDEuNTI1LS43NjEgMy41MDguNDU5cy45MTYgMS45ODMgMi40NDEgMi44OThjMS41MjYuOTE2IDQuNTc2IDMuMjAyIDYuODY0IDUuNjQzczIuMjg5IDIuNzQ2IDIuMjg5IDIuNzQ2bC0xLjUyNiAyLjI4OXMtNC41NzctNi43MTMtNy45MzMtNi44NjVjLTMuMzU2LS4xNTMtNC44OCAzLjIwMy03LjAxNiAzLjIwMy0yLjEzNSAwLTEuNjc4LTQuMjcxLTEuNjc4LTQuMjcxcy0xLjM3MiAxMS4xMzUtOSA2LjEwMWMtNS44NjItMy44NjktLjc0MS02LjQ2OSAxLjk0OC03LjQ2OS0zLjIzMyAxLjAwNy0xMS4xNjEgMi45OC0xMC43OTUtMi4xNC4wOTItMS4yOTUuNzk1LTIuMzA1IDEuODY3LTMuMDk0LTIuMTAxLS4yNjEtMy42OTktLjU2Ni0zLjY5OS0uNTY2cy00LjQyMyAyLjQzOS04LjM4OSAxLjIxOGMtMi45MjctLjktMi4wMzMtMi41NDUtMS4zNjMtMy4zNDctLjg5OS43NjctMy4xMDkgMS44MjYtNi4xMTItMi40NDgtNC42NDctNi42MTMtMi40NjQtNi43MjUtLjgwNC02LjE3MS0zLjM3Ny0yLjIyMS05LjA5Ny05LjgzNy00LjM4My05LjY5NHoiIGZpbGw9IiNmZmQ0MmEiIGZpbGwtcnVsZT0ibm9uemVybyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLjQzMjgxNiAuMjUzOTE3KSIvPjxwYXRoIGQ9Im0yMDguOTY3IDE0NS45NDljLTUuMDM0LjE1My00LjQyNSAyLjI4OC0xMC44MzIgMTIuMzU2LTIuNzM0IDQuMjk2LTcuNDM5IDYuMzk0LTExLjkzNiA3LjM5MiA5LjA0LTMuMjU2IDExLjcxLTEyLjAzNSAxMS40NzktMTIuNzMtLjMwNS0uOTE1LTMuMjAzLTEuODMyLTQuNzI5LS43NjQtMS41MjUgMS4wNjgtLjYwOSA0Ljg4Mi00Ljg4MSA5Ljc2NC0xLjcwMyAxLjk0Ni00LjAzNiAzLjA5MS02LjIyNiAzLjc2NS00LjgyMy0xLjc2Ny0xMi4yMi0xLjQzMS0xMy43NTgtMS4wMjEtMi4yODguNjEtMS4zNzMgMi4xMzYtMi44OTggMi43NDYtMS41MjYuNjEtMS41MjUtLjc2MS0zLjUwOC40NTlzLS45MTYgMS45ODMtMi40NDIgMi44OThjLTEuNTI1LjkxNi00LjU3NSAzLjIwMi02Ljg2MyA1LjY0M3MtMi4yODkgMi43NDYtMi4yODkgMi43NDZsMS41MjUgMi4yODlzNC41NzgtNi43MTMgNy45MzQtNi44NjVjMy4zNTYtLjE1MyA0Ljg4IDMuMjAzIDcuMDE2IDMuMjAzIDIuMTM1IDAgMS42NzctNC4yNzEgMS42NzctNC4yNzFzMS4zNzMgMTEuMTM1IDkgNi4xMDFjNS44NjMtMy44NjkuNzQyLTYuNDY5LTEuOTQ3LTcuNDY5IDMuMjMzIDEuMDA3IDExLjE2MSAyLjk4IDEwLjc5NS0yLjE0LS4wOTItMS4yOTUtLjc5NS0yLjMwNS0xLjg2Ny0zLjA5NCAyLjEwMS0uMjYxIDMuNjk5LS41NjYgMy42OTktLjU2NnM0LjQyMyAyLjQzOSA4LjM4OSAxLjIxOGMyLjkyNy0uOSAyLjAzMy0yLjU0NSAxLjM2My0zLjM0Ny44OTkuNzY3IDMuMTA4IDEuODI2IDYuMTExLTIuNDQ4IDQuNjQ4LTYuNjEzIDIuNDY1LTYuNzI1LjgwNS02LjE3MSAzLjM3Ny0yLjIyMSA5LjA5Ny05LjgzNyA0LjM4My05LjY5NHoiIGZpbGw9IiNmZmQ0MmEiIGZpbGwtcnVsZT0ibm9uemVybyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEuNDcwMzUgLS4wNTM4NDYpIi8+PHBhdGggZD0ibTE0My4yNDMgMTk4LjI1NGMtMzMuMDA2IDAtMzIuMTQzLTMuNjY4LTQ4Ljk3LTMuNjY4cy0zMS40OTYgMi44MDUtMzEuNDk2IDcuMzM1IDExLjAwMiAyNS4yNCA4MC40NjYgMjUuMjQgNzguOTU2LTE5LjIgNzguOTU2LTI0LjE2MWMwLTQuOTYyLTE1Ljk2NC04LjYzLTI2LjEwMy04LjYzcy0yMi42NTEgMy44ODQtNTIuODUzIDMuODg0eiIgZmlsbD0iIzMzMyIgZmlsbC1ydWxlPSJub256ZXJvIi8+PC9nPjxwYXRoIGQ9Im0xMjYuOTgzNjcxOTIzIDk0LjYxMDMxODIwM2gyNy44MjI3ODA3Mjh2MjcuODIyNzgwNzI4aC0yNy44MjI3ODA3Mjh6IiBmaWxsPSIjMTU2NmViIiBzdHJva2UtbWl0ZXJsaW1pdD0iMSIgc3Ryb2tlLXdpZHRoPSIuODY4NTIxIi8+PHBhdGggZD0ibTE0MC43MzA1NjE5MjMgMTIyLjQwMjIxODIwM2gyNy44MjI3ODA3Mjh2MjcuODIyNzgwNzI4aC0yNy44MjI3ODA3Mjh6IiBmaWxsPSIjNGNiZTAwIiBzdHJva2UtbWl0ZXJsaW1pdD0iMSIgc3Ryb2tlLXdpZHRoPSIuODY4NTIxIi8+PHBhdGggZD0ibTExMi44NTM5NjE5MjMgMTIyLjQwMjIxODIwM2gyNy44MjI3ODA3Mjh2MjcuODIyNzgwNzI4aC0yNy44MjI3ODA3Mjh6IiBmaWxsPSIjZmZiMDBiIiBzdHJva2UtbWl0ZXJsaW1pdD0iMSIgc3Ryb2tlLXdpZHRoPSIuODY4NTIxIi8+PC9nPjwvZz48L3N2Zz4="
+	href="/apps/jcr-hopper/script-builder.html"
+	id="com.swisscom.aem.tools.jcrhopper.script-builder"
+	target="_blank"
+/>