diff --git a/.wordlist-sh b/.wordlist-sh
index b5c6e1f0..faebc6dc 100644
--- a/.wordlist-sh
+++ b/.wordlist-sh
@@ -6,6 +6,7 @@ acks
 addext
 addon
 adp
+adrezni
 af
 AllNamespaces
 amd
@@ -45,13 +46,18 @@ chroot
 clustermanagementaddons
 clustermanagers
 CN
+consoleplugin
 Containerfile
 containerregistry
 coreos
 crd
 crds
 creationTimestamp
+crs
 crt
+csv
+csvs
+CSVS
 ctrl
 CTRL
 currentCSVDesc
@@ -69,6 +75,7 @@ df
 dirname
 DIRS
 displayName
+distruct
 dl
 DL
 dn
@@ -184,6 +191,7 @@ multiclusterhubs
 multiclusterobservabilities
 MultiNamespace
 musl
+mutatingwebhookconfiguration
 namedCertificates
 nat
 nbB
@@ -256,6 +264,7 @@ ServerAliveInterval
 serverlessservices
 servicemeshcontrolplanes
 servicemeshmembers
+servicemeshoperator
 servingCertificate
 servingCerts
 sha
@@ -297,6 +306,7 @@ userpreferences
 usr
 uuid
 UUID
+validatingwebhookconfiguration
 validatingwebhookconfigurations
 validators
 velero
@@ -312,6 +322,7 @@ vzx
 WantedBy
 wc
 webhook
+webhooks
 wipefs
 wo
 wordlist
diff --git a/bootstrap/README.md b/bootstrap/README.md
deleted file mode 100644
index e69de29b..00000000
diff --git a/components/cluster-configs/adhoc-admin/cluster-reset/uninstall.sh b/components/cluster-configs/adhoc-admin/cluster-reset/uninstall.sh
index dbe8fdc5..459ebc48 100755
--- a/components/cluster-configs/adhoc-admin/cluster-reset/uninstall.sh
+++ b/components/cluster-configs/adhoc-admin/cluster-reset/uninstall.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2120
 
 TIMEOUT=60
 DEFAULT_CRDS=ocp-default-crds-4.16.txt
diff --git a/clusters/README.md b/demos/components/clusters/README.md
similarity index 100%
rename from clusters/README.md
rename to demos/components/clusters/README.md
diff --git a/clusters/argo-managed/base/argocd-instance.yaml b/demos/components/clusters/argo-managed/base/argocd-instance.yaml
similarity index 100%
rename from clusters/argo-managed/base/argocd-instance.yaml
rename to demos/components/clusters/argo-managed/base/argocd-instance.yaml
diff --git a/clusters/argo-managed/base/argocd-repo-https.yaml b/demos/components/clusters/argo-managed/base/argocd-repo-https.yaml
similarity index 100%
rename from clusters/argo-managed/base/argocd-repo-https.yaml
rename to demos/components/clusters/argo-managed/base/argocd-repo-https.yaml
diff --git a/clusters/argo-managed/base/argocd-repo-ssh-ss.yaml b/demos/components/clusters/argo-managed/base/argocd-repo-ssh-ss.yaml
similarity index 100%
rename from clusters/argo-managed/base/argocd-repo-ssh-ss.yaml
rename to demos/components/clusters/argo-managed/base/argocd-repo-ssh-ss.yaml
diff --git a/clusters/argo-managed/base/kustomization.yaml b/demos/components/clusters/argo-managed/base/kustomization.yaml
similarity index 100%
rename from clusters/argo-managed/base/kustomization.yaml
rename to demos/components/clusters/argo-managed/base/kustomization.yaml
diff --git a/clusters/argo-managed/overlays/default/kustomization.yaml b/demos/components/clusters/argo-managed/overlays/default/kustomization.yaml
similarity index 100%
rename from clusters/argo-managed/overlays/default/kustomization.yaml
rename to demos/components/clusters/argo-managed/overlays/default/kustomization.yaml
diff --git a/clusters/default/kustomization.yaml b/demos/components/clusters/default/kustomization.yaml
similarity index 100%
rename from clusters/default/kustomization.yaml
rename to demos/components/clusters/default/kustomization.yaml
diff --git a/bootstrap/install-argocd/kustomization.yaml b/demos/components/install-argocd/kustomization.yaml
similarity index 100%
rename from bootstrap/install-argocd/kustomization.yaml
rename to demos/components/install-argocd/kustomization.yaml
diff --git a/bootstrap/install-web-terminal/kustomization.yaml b/demos/components/install-web-terminal/kustomization.yaml
similarity index 100%
rename from bootstrap/install-web-terminal/kustomization.yaml
rename to demos/components/install-web-terminal/kustomization.yaml