diff --git a/KNEL-NonCloudron/RandD/Apps/app.ap4ap.org/Dockerfile b/NonCloudron/RandD/Apps/app.ap4ap.org/Dockerfile
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.ap4ap.org/Dockerfile
rename to NonCloudron/RandD/Apps/app.ap4ap.org/Dockerfile
diff --git a/KNEL-NonCloudron/RandD/Apps/app.ap4ap.org/devcontainer.json b/NonCloudron/RandD/Apps/app.ap4ap.org/devcontainer.json
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.ap4ap.org/devcontainer.json
rename to NonCloudron/RandD/Apps/app.ap4ap.org/devcontainer.json
diff --git a/KNEL-NonCloudron/RandD/Apps/app.ap4ap.org/docker-compose.yml b/NonCloudron/RandD/Apps/app.ap4ap.org/docker-compose.yml
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.ap4ap.org/docker-compose.yml
rename to NonCloudron/RandD/Apps/app.ap4ap.org/docker-compose.yml
diff --git a/KNEL-NonCloudron/RandD/Apps/app.hfnfc.net/Dockerfile b/NonCloudron/RandD/Apps/app.hfnfc.net/Dockerfile
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.hfnfc.net/Dockerfile
rename to NonCloudron/RandD/Apps/app.hfnfc.net/Dockerfile
diff --git a/KNEL-NonCloudron/RandD/Apps/app.hfnfc.net/devcontainer.json b/NonCloudron/RandD/Apps/app.hfnfc.net/devcontainer.json
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.hfnfc.net/devcontainer.json
rename to NonCloudron/RandD/Apps/app.hfnfc.net/devcontainer.json
diff --git a/KNEL-NonCloudron/RandD/Apps/app.hfnfc.net/docker-compose.yml b/NonCloudron/RandD/Apps/app.hfnfc.net/docker-compose.yml
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.hfnfc.net/docker-compose.yml
rename to NonCloudron/RandD/Apps/app.hfnfc.net/docker-compose.yml
diff --git a/KNEL-NonCloudron/RandD/Apps/app.hfnoc.net/Dockerfile b/NonCloudron/RandD/Apps/app.hfnoc.net/Dockerfile
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.hfnoc.net/Dockerfile
rename to NonCloudron/RandD/Apps/app.hfnoc.net/Dockerfile
diff --git a/KNEL-NonCloudron/RandD/Apps/app.hfnoc.net/docker-compose.yml b/NonCloudron/RandD/Apps/app.hfnoc.net/docker-compose.yml
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.hfnoc.net/docker-compose.yml
rename to NonCloudron/RandD/Apps/app.hfnoc.net/docker-compose.yml
diff --git a/KNEL-NonCloudron/RandD/Apps/app.merchantsofhope.org/Dockerfile b/NonCloudron/RandD/Apps/app.merchantsofhope.org/Dockerfile
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.merchantsofhope.org/Dockerfile
rename to NonCloudron/RandD/Apps/app.merchantsofhope.org/Dockerfile
diff --git a/KNEL-NonCloudron/RandD/Apps/app.merchantsofhope.org/devcontainer.json b/NonCloudron/RandD/Apps/app.merchantsofhope.org/devcontainer.json
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.merchantsofhope.org/devcontainer.json
rename to NonCloudron/RandD/Apps/app.merchantsofhope.org/devcontainer.json
diff --git a/KNEL-NonCloudron/RandD/Apps/app.merchantsofhope.org/docker-compose.yml b/NonCloudron/RandD/Apps/app.merchantsofhope.org/docker-compose.yml
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.merchantsofhope.org/docker-compose.yml
rename to NonCloudron/RandD/Apps/app.merchantsofhope.org/docker-compose.yml
diff --git a/KNEL-NonCloudron/RandD/Apps/app.rackrental.net/Dockerfile b/NonCloudron/RandD/Apps/app.rackrental.net/Dockerfile
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.rackrental.net/Dockerfile
rename to NonCloudron/RandD/Apps/app.rackrental.net/Dockerfile
diff --git a/KNEL-NonCloudron/RandD/Apps/app.rackrental.net/devcontainer.json b/NonCloudron/RandD/Apps/app.rackrental.net/devcontainer.json
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.rackrental.net/devcontainer.json
rename to NonCloudron/RandD/Apps/app.rackrental.net/devcontainer.json
diff --git a/KNEL-NonCloudron/RandD/Apps/app.rackrental.net/docker-compose.yml b/NonCloudron/RandD/Apps/app.rackrental.net/docker-compose.yml
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.rackrental.net/docker-compose.yml
rename to NonCloudron/RandD/Apps/app.rackrental.net/docker-compose.yml
diff --git a/KNEL-NonCloudron/RandD/Apps/app.sidedoorgroup.org/Dockerfile b/NonCloudron/RandD/Apps/app.sidedoorgroup.org/Dockerfile
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.sidedoorgroup.org/Dockerfile
rename to NonCloudron/RandD/Apps/app.sidedoorgroup.org/Dockerfile
diff --git a/KNEL-NonCloudron/RandD/Apps/app.sidedoorgroup.org/devcontainer.json b/NonCloudron/RandD/Apps/app.sidedoorgroup.org/devcontainer.json
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.sidedoorgroup.org/devcontainer.json
rename to NonCloudron/RandD/Apps/app.sidedoorgroup.org/devcontainer.json
diff --git a/KNEL-NonCloudron/RandD/Apps/app.sidedoorgroup.org/docker-compose.yml b/NonCloudron/RandD/Apps/app.sidedoorgroup.org/docker-compose.yml
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.sidedoorgroup.org/docker-compose.yml
rename to NonCloudron/RandD/Apps/app.sidedoorgroup.org/docker-compose.yml
diff --git a/KNEL-NonCloudron/RandD/Apps/app.startinglineprodictions.com/Dockerfile b/NonCloudron/RandD/Apps/app.startinglineprodictions.com/Dockerfile
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.startinglineprodictions.com/Dockerfile
rename to NonCloudron/RandD/Apps/app.startinglineprodictions.com/Dockerfile
diff --git a/KNEL-NonCloudron/RandD/Apps/app.startinglineprodictions.com/devcontainer.json b/NonCloudron/RandD/Apps/app.startinglineprodictions.com/devcontainer.json
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.startinglineprodictions.com/devcontainer.json
rename to NonCloudron/RandD/Apps/app.startinglineprodictions.com/devcontainer.json
diff --git a/KNEL-NonCloudron/RandD/Apps/app.startinglineprodictions.com/docker-compose.yml b/NonCloudron/RandD/Apps/app.startinglineprodictions.com/docker-compose.yml
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.startinglineprodictions.com/docker-compose.yml
rename to NonCloudron/RandD/Apps/app.startinglineprodictions.com/docker-compose.yml
diff --git a/KNEL-NonCloudron/RandD/Apps/app.teamrental.net/Dockerfile b/NonCloudron/RandD/Apps/app.teamrental.net/Dockerfile
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.teamrental.net/Dockerfile
rename to NonCloudron/RandD/Apps/app.teamrental.net/Dockerfile
diff --git a/KNEL-NonCloudron/RandD/Apps/app.teamrental.net/devcontainer.json b/NonCloudron/RandD/Apps/app.teamrental.net/devcontainer.json
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.teamrental.net/devcontainer.json
rename to NonCloudron/RandD/Apps/app.teamrental.net/devcontainer.json
diff --git a/KNEL-NonCloudron/RandD/Apps/app.teamrental.net/docker-compose.yml b/NonCloudron/RandD/Apps/app.teamrental.net/docker-compose.yml
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.teamrental.net/docker-compose.yml
rename to NonCloudron/RandD/Apps/app.teamrental.net/docker-compose.yml
diff --git a/KNEL-NonCloudron/RandD/Apps/app.yourdreamnamehere.com/Dockerfile b/NonCloudron/RandD/Apps/app.yourdreamnamehere.com/Dockerfile
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.yourdreamnamehere.com/Dockerfile
rename to NonCloudron/RandD/Apps/app.yourdreamnamehere.com/Dockerfile
diff --git a/KNEL-NonCloudron/RandD/Apps/app.yourdreamnamehere.com/devcontainer.json b/NonCloudron/RandD/Apps/app.yourdreamnamehere.com/devcontainer.json
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.yourdreamnamehere.com/devcontainer.json
rename to NonCloudron/RandD/Apps/app.yourdreamnamehere.com/devcontainer.json
diff --git a/KNEL-NonCloudron/RandD/Apps/app.yourdreamnamehere.com/docker-compose.yml b/NonCloudron/RandD/Apps/app.yourdreamnamehere.com/docker-compose.yml
similarity index 100%
rename from KNEL-NonCloudron/RandD/Apps/app.yourdreamnamehere.com/docker-compose.yml
rename to NonCloudron/RandD/Apps/app.yourdreamnamehere.com/docker-compose.yml
diff --git a/KNEL-NonCloudron/RandD/GIS-backend/README.md b/NonCloudron/RandD/GIS-backend/README.md
similarity index 100%
rename from KNEL-NonCloudron/RandD/GIS-backend/README.md
rename to NonCloudron/RandD/GIS-backend/README.md
diff --git a/KNEL-NonCloudron/RandD/GIS-backend/input-files/info b/NonCloudron/RandD/GIS-backend/input-files/info
similarity index 100%
rename from KNEL-NonCloudron/RandD/GIS-backend/input-files/info
rename to NonCloudron/RandD/GIS-backend/input-files/info
diff --git a/KNEL-NonCloudron/RandD/GIS-backend/output-files/info b/NonCloudron/RandD/GIS-backend/output-files/info
similarity index 100%
rename from KNEL-NonCloudron/RandD/GIS-backend/output-files/info
rename to NonCloudron/RandD/GIS-backend/output-files/info
diff --git a/KNEL-NonCloudron/RandD/GIS-backend/vendor-files/info b/NonCloudron/RandD/GIS-backend/vendor-files/info
similarity index 100%
rename from KNEL-NonCloudron/RandD/GIS-backend/vendor-files/info
rename to NonCloudron/RandD/GIS-backend/vendor-files/info
diff --git a/KNEL-NonCloudron/RandD/portmap.md b/NonCloudron/RandD/portmap.md
similarity index 100%
rename from KNEL-NonCloudron/RandD/portmap.md
rename to NonCloudron/RandD/portmap.md
diff --git a/KNEL-NonCloudron/orchestration/TSYSK8S/TSYSK8S.md b/NonCloudron/orchestration/TSYSK8S/TSYSK8S.md
similarity index 100%
rename from KNEL-NonCloudron/orchestration/TSYSK8S/TSYSK8S.md
rename to NonCloudron/orchestration/TSYSK8S/TSYSK8S.md
diff --git a/KNEL-NonCloudron/orchestration/nonk8s.md b/NonCloudron/orchestration/nonk8s.md
similarity index 100%
rename from KNEL-NonCloudron/orchestration/nonk8s.md
rename to NonCloudron/orchestration/nonk8s.md
diff --git a/CloudronPackagingWorkspace/README.md b/PackagingForCloudronWorkspace/README.md
similarity index 100%
rename from CloudronPackagingWorkspace/README.md
rename to PackagingForCloudronWorkspace/README.md
diff --git a/CloudronPackagingWorkspace/UpstreamVendor-Clone.sh b/PackagingForCloudronWorkspace/UpstreamVendor-Clone.sh
similarity index 100%
rename from CloudronPackagingWorkspace/UpstreamVendor-Clone.sh
rename to PackagingForCloudronWorkspace/UpstreamVendor-Clone.sh
diff --git a/CloudronPackagingWorkspace/UpstreamVendor-Update.sh b/PackagingForCloudronWorkspace/UpstreamVendor-Update.sh
similarity index 100%
rename from CloudronPackagingWorkspace/UpstreamVendor-Update.sh
rename to PackagingForCloudronWorkspace/UpstreamVendor-Update.sh