diff --git a/docs/glassfish/README.md b/docs/README.md
similarity index 94%
rename from docs/glassfish/README.md
rename to docs/README.md
index 4e78b4c..5f3a9d0 100644
--- a/docs/glassfish/README.md
+++ b/docs/README.md
@@ -53,6 +53,3 @@
 ## To Do
 
 * Add a Jenkins job that waits for changes and publishes the web site.
-* Move this directory from `docs/glassfish` to `docs`.  (The extra
-directory layer seems gratuitous.)
-* Deploy/publish 5.1.0 versions of the docs.
diff --git a/docs/glassfish/add-on-component-development-guide/README.md b/docs/add-on-component-development-guide/README.md
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/README.md
rename to docs/add-on-component-development-guide/README.md
diff --git a/docs/glassfish/add-on-component-development-guide/pom.xml b/docs/add-on-component-development-guide/pom.xml
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/pom.xml
rename to docs/add-on-component-development-guide/pom.xml
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/css/style.css b/docs/add-on-component-development-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/css/style.css
rename to docs/add-on-component-development-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/add-on-component-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/add-on-component-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/adding-configuration-data.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/adding-configuration-data.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/adding-configuration-data.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/adding-configuration-data.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/adding-monitoring-capabilities.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/adding-monitoring-capabilities.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/adding-monitoring-capabilities.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/adding-monitoring-capabilities.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/extending-asadmin.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/extending-asadmin.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/extending-asadmin.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/extending-asadmin.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/extending-the-admin-console.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/extending-the-admin-console.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/extending-the-admin-console.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/extending-the-admin-console.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/integration-point-reference.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/integration-point-reference.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/integration-point-reference.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/integration-point-reference.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/introduction.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/introduction.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/introduction.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/introduction.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/loe.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/loe.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/lot.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/lot.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/packaging-integrating-delivering.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/packaging-integrating-delivering.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/packaging-integrating-delivering.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/packaging-integrating-delivering.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/preface.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/preface.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/session-persistence-modules.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/session-persistence-modules.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/session-persistence-modules.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/session-persistence-modules.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/title.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/title.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/toc.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/toc.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/content/writing-hk2-components.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/writing-hk2-components.adoc
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/content/writing-hk2-components.adoc
rename to docs/add-on-component-development-guide/src/main/jbake/content/writing-hk2-components.adoc
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/jbake.properties b/docs/add-on-component-development-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/jbake.properties
rename to docs/add-on-component-development-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/footer.ftl b/docs/add-on-component-development-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/footer.ftl
rename to docs/add-on-component-development-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/header.ftl b/docs/add-on-component-development-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/header.ftl
rename to docs/add-on-component-development-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/menu.ftl b/docs/add-on-component-development-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/menu.ftl
rename to docs/add-on-component-development-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/page.ftl b/docs/add-on-component-development-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/add-on-component-development-guide/src/main/jbake/templates/page.ftl
rename to docs/add-on-component-development-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/administration-guide/README.md b/docs/administration-guide/README.md
similarity index 100%
rename from docs/glassfish/administration-guide/README.md
rename to docs/administration-guide/README.md
diff --git a/docs/glassfish/administration-guide/pom.xml b/docs/administration-guide/pom.xml
similarity index 100%
rename from docs/glassfish/administration-guide/pom.xml
rename to docs/administration-guide/pom.xml
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/css/style.css b/docs/administration-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/assets/css/style.css
rename to docs/administration-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/img/rest-management.png b/docs/administration-guide/src/main/jbake/assets/img/rest-management.png
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/assets/img/rest-management.png
rename to docs/administration-guide/src/main/jbake/assets/img/rest-management.png
Binary files differ
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/img/rest-monitoring.png b/docs/administration-guide/src/main/jbake/assets/img/rest-monitoring.png
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/assets/img/rest-monitoring.png
rename to docs/administration-guide/src/main/jbake/assets/img/rest-monitoring.png
Binary files differ
diff --git a/docs/glassfish/administration-guide/src/main/jbake/assets/img/websphere-mq.png b/docs/administration-guide/src/main/jbake/assets/img/websphere-mq.png
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/assets/img/websphere-mq.png
rename to docs/administration-guide/src/main/jbake/assets/img/websphere-mq.png
Binary files differ
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/asadmin-subcommands.adoc b/docs/administration-guide/src/main/jbake/content/asadmin-subcommands.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/asadmin-subcommands.adoc
rename to docs/administration-guide/src/main/jbake/content/asadmin-subcommands.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/batch.adoc b/docs/administration-guide/src/main/jbake/content/batch.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/batch.adoc
rename to docs/administration-guide/src/main/jbake/content/batch.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/concurrent.adoc b/docs/administration-guide/src/main/jbake/content/concurrent.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/concurrent.adoc
rename to docs/administration-guide/src/main/jbake/content/concurrent.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/connectors.adoc b/docs/administration-guide/src/main/jbake/content/connectors.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/connectors.adoc
rename to docs/administration-guide/src/main/jbake/content/connectors.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/domains.adoc b/docs/administration-guide/src/main/jbake/content/domains.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/domains.adoc
rename to docs/administration-guide/src/main/jbake/content/domains.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/general-administration.adoc b/docs/administration-guide/src/main/jbake/content/general-administration.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/general-administration.adoc
rename to docs/administration-guide/src/main/jbake/content/general-administration.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/http_https.adoc b/docs/administration-guide/src/main/jbake/content/http_https.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/http_https.adoc
rename to docs/administration-guide/src/main/jbake/content/http_https.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/javamail.adoc b/docs/administration-guide/src/main/jbake/content/javamail.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/javamail.adoc
rename to docs/administration-guide/src/main/jbake/content/javamail.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/jdbc.adoc b/docs/administration-guide/src/main/jbake/content/jdbc.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/jdbc.adoc
rename to docs/administration-guide/src/main/jbake/content/jdbc.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/jms.adoc b/docs/administration-guide/src/main/jbake/content/jms.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/jms.adoc
rename to docs/administration-guide/src/main/jbake/content/jms.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/jndi.adoc b/docs/administration-guide/src/main/jbake/content/jndi.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/jndi.adoc
rename to docs/administration-guide/src/main/jbake/content/jndi.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/jvm.adoc b/docs/administration-guide/src/main/jbake/content/jvm.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/jvm.adoc
rename to docs/administration-guide/src/main/jbake/content/jvm.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/lifecycle-modules.adoc b/docs/administration-guide/src/main/jbake/content/lifecycle-modules.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/lifecycle-modules.adoc
rename to docs/administration-guide/src/main/jbake/content/lifecycle-modules.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/loe.adoc b/docs/administration-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/loe.adoc
rename to docs/administration-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/lof.adoc b/docs/administration-guide/src/main/jbake/content/lof.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/lof.adoc
rename to docs/administration-guide/src/main/jbake/content/lof.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/logging.adoc b/docs/administration-guide/src/main/jbake/content/logging.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/logging.adoc
rename to docs/administration-guide/src/main/jbake/content/logging.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/lot.adoc b/docs/administration-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/lot.adoc
rename to docs/administration-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/monitoring.adoc b/docs/administration-guide/src/main/jbake/content/monitoring.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/monitoring.adoc
rename to docs/administration-guide/src/main/jbake/content/monitoring.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/orb.adoc b/docs/administration-guide/src/main/jbake/content/orb.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/orb.adoc
rename to docs/administration-guide/src/main/jbake/content/orb.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/overview.adoc b/docs/administration-guide/src/main/jbake/content/overview.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/overview.adoc
rename to docs/administration-guide/src/main/jbake/content/overview.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/part-appendixes.adoc b/docs/administration-guide/src/main/jbake/content/part-appendixes.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/part-appendixes.adoc
rename to docs/administration-guide/src/main/jbake/content/part-appendixes.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/part-res-and-svcs-admin.adoc b/docs/administration-guide/src/main/jbake/content/part-res-and-svcs-admin.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/part-res-and-svcs-admin.adoc
rename to docs/administration-guide/src/main/jbake/content/part-res-and-svcs-admin.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/part-runtime-admin.adoc b/docs/administration-guide/src/main/jbake/content/part-runtime-admin.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/part-runtime-admin.adoc
rename to docs/administration-guide/src/main/jbake/content/part-runtime-admin.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/preface.adoc b/docs/administration-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/preface.adoc
rename to docs/administration-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/threadpools.adoc b/docs/administration-guide/src/main/jbake/content/threadpools.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/threadpools.adoc
rename to docs/administration-guide/src/main/jbake/content/threadpools.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/title.adoc b/docs/administration-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/title.adoc
rename to docs/administration-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/toc.adoc b/docs/administration-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/toc.adoc
rename to docs/administration-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/transactions.adoc b/docs/administration-guide/src/main/jbake/content/transactions.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/transactions.adoc
rename to docs/administration-guide/src/main/jbake/content/transactions.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/content/webapps.adoc b/docs/administration-guide/src/main/jbake/content/webapps.adoc
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/content/webapps.adoc
rename to docs/administration-guide/src/main/jbake/content/webapps.adoc
diff --git a/docs/glassfish/administration-guide/src/main/jbake/jbake.properties b/docs/administration-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/jbake.properties
rename to docs/administration-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/administration-guide/src/main/jbake/templates/footer.ftl b/docs/administration-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/templates/footer.ftl
rename to docs/administration-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/administration-guide/src/main/jbake/templates/header.ftl b/docs/administration-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/templates/header.ftl
rename to docs/administration-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/administration-guide/src/main/jbake/templates/menu.ftl b/docs/administration-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/templates/menu.ftl
rename to docs/administration-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/administration-guide/src/main/jbake/templates/page.ftl b/docs/administration-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/administration-guide/src/main/jbake/templates/page.ftl
rename to docs/administration-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/application-deployment-guide/README.md b/docs/application-deployment-guide/README.md
similarity index 100%
rename from docs/glassfish/application-deployment-guide/README.md
rename to docs/application-deployment-guide/README.md
diff --git a/docs/glassfish/application-deployment-guide/pom.xml b/docs/application-deployment-guide/pom.xml
similarity index 100%
rename from docs/glassfish/application-deployment-guide/pom.xml
rename to docs/application-deployment-guide/pom.xml
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/css/style.css b/docs/application-deployment-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/assets/css/style.css
rename to docs/application-deployment-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/img/dgdeploy3.png b/docs/application-deployment-guide/src/main/jbake/assets/img/dgdeploy3.png
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/assets/img/dgdeploy3.png
rename to docs/application-deployment-guide/src/main/jbake/assets/img/dgdeploy3.png
Binary files differ
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/img/dgdeploya.png b/docs/application-deployment-guide/src/main/jbake/assets/img/dgdeploya.png
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/assets/img/dgdeploya.png
rename to docs/application-deployment-guide/src/main/jbake/assets/img/dgdeploya.png
Binary files differ
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/application-deployment-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/application-deployment-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc b/docs/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/dd-elements.adoc b/docs/application-deployment-guide/src/main/jbake/content/dd-elements.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/dd-elements.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/dd-elements.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/dd-files.adoc b/docs/application-deployment-guide/src/main/jbake/content/dd-files.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/dd-files.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/dd-files.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc b/docs/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/loe.adoc b/docs/application-deployment-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/loe.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/lof.adoc b/docs/application-deployment-guide/src/main/jbake/content/lof.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/lof.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/lof.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/lot.adoc b/docs/application-deployment-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/lot.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/overview.adoc b/docs/application-deployment-guide/src/main/jbake/content/overview.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/overview.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/overview.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/preface.adoc b/docs/application-deployment-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/preface.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/title.adoc b/docs/application-deployment-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/title.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/content/toc.adoc b/docs/application-deployment-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/content/toc.adoc
rename to docs/application-deployment-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/jbake.properties b/docs/application-deployment-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/jbake.properties
rename to docs/application-deployment-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/templates/footer.ftl b/docs/application-deployment-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/templates/footer.ftl
rename to docs/application-deployment-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/templates/header.ftl b/docs/application-deployment-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/templates/header.ftl
rename to docs/application-deployment-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/templates/menu.ftl b/docs/application-deployment-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/templates/menu.ftl
rename to docs/application-deployment-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/application-deployment-guide/src/main/jbake/templates/page.ftl b/docs/application-deployment-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/application-deployment-guide/src/main/jbake/templates/page.ftl
rename to docs/application-deployment-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/application-development-guide/README.md b/docs/application-development-guide/README.md
similarity index 100%
rename from docs/glassfish/application-development-guide/README.md
rename to docs/application-development-guide/README.md
diff --git a/docs/glassfish/application-development-guide/pom.xml b/docs/application-development-guide/pom.xml
similarity index 100%
rename from docs/glassfish/application-development-guide/pom.xml
rename to docs/application-development-guide/pom.xml
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/css/style.css b/docs/application-development-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/assets/css/style.css
rename to docs/application-development-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/application-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/application-development-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/class-loaders.adoc b/docs/application-development-guide/src/main/jbake/content/class-loaders.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/class-loaders.adoc
rename to docs/application-development-guide/src/main/jbake/content/class-loaders.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/connectors.adoc b/docs/application-development-guide/src/main/jbake/content/connectors.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/connectors.adoc
rename to docs/application-development-guide/src/main/jbake/content/connectors.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/container_managed-persistence.adoc b/docs/application-development-guide/src/main/jbake/content/container_managed-persistence.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/container_managed-persistence.adoc
rename to docs/application-development-guide/src/main/jbake/content/container_managed-persistence.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/debugging-apps.adoc b/docs/application-development-guide/src/main/jbake/content/debugging-apps.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/debugging-apps.adoc
rename to docs/application-development-guide/src/main/jbake/content/debugging-apps.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/ejb.adoc b/docs/application-development-guide/src/main/jbake/content/ejb.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/ejb.adoc
rename to docs/application-development-guide/src/main/jbake/content/ejb.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/java-clients.adoc b/docs/application-development-guide/src/main/jbake/content/java-clients.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/java-clients.adoc
rename to docs/application-development-guide/src/main/jbake/content/java-clients.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/javamail.adoc b/docs/application-development-guide/src/main/jbake/content/javamail.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/javamail.adoc
rename to docs/application-development-guide/src/main/jbake/content/javamail.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/jdbc.adoc b/docs/application-development-guide/src/main/jbake/content/jdbc.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/jdbc.adoc
rename to docs/application-development-guide/src/main/jbake/content/jdbc.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/jms.adoc b/docs/application-development-guide/src/main/jbake/content/jms.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/jms.adoc
rename to docs/application-development-guide/src/main/jbake/content/jms.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/jndi.adoc b/docs/application-development-guide/src/main/jbake/content/jndi.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/jndi.adoc
rename to docs/application-development-guide/src/main/jbake/content/jndi.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/jpa.adoc b/docs/application-development-guide/src/main/jbake/content/jpa.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/jpa.adoc
rename to docs/application-development-guide/src/main/jbake/content/jpa.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc b/docs/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc
rename to docs/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/loe.adoc b/docs/application-development-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/loe.adoc
rename to docs/application-development-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/lot.adoc b/docs/application-development-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/lot.adoc
rename to docs/application-development-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/osgi.adoc b/docs/application-development-guide/src/main/jbake/content/osgi.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/osgi.adoc
rename to docs/application-development-guide/src/main/jbake/content/osgi.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/part-apps-and-app-comps.adoc b/docs/application-development-guide/src/main/jbake/content/part-apps-and-app-comps.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/part-apps-and-app-comps.adoc
rename to docs/application-development-guide/src/main/jbake/content/part-apps-and-app-comps.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/part-services-and-apis.adoc b/docs/application-development-guide/src/main/jbake/content/part-services-and-apis.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/part-services-and-apis.adoc
rename to docs/application-development-guide/src/main/jbake/content/part-services-and-apis.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/part-tasks-and-tools.adoc b/docs/application-development-guide/src/main/jbake/content/part-tasks-and-tools.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/part-tasks-and-tools.adoc
rename to docs/application-development-guide/src/main/jbake/content/part-tasks-and-tools.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/preface.adoc b/docs/application-development-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/preface.adoc
rename to docs/application-development-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/securing-apps.adoc b/docs/application-development-guide/src/main/jbake/content/securing-apps.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/securing-apps.adoc
rename to docs/application-development-guide/src/main/jbake/content/securing-apps.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc b/docs/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc
rename to docs/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/title.adoc b/docs/application-development-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/title.adoc
rename to docs/application-development-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/toc.adoc b/docs/application-development-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/toc.adoc
rename to docs/application-development-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/transaction-service.adoc b/docs/application-development-guide/src/main/jbake/content/transaction-service.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/transaction-service.adoc
rename to docs/application-development-guide/src/main/jbake/content/transaction-service.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/webapps.adoc b/docs/application-development-guide/src/main/jbake/content/webapps.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/webapps.adoc
rename to docs/application-development-guide/src/main/jbake/content/webapps.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/content/webservices.adoc b/docs/application-development-guide/src/main/jbake/content/webservices.adoc
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/content/webservices.adoc
rename to docs/application-development-guide/src/main/jbake/content/webservices.adoc
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/jbake.properties b/docs/application-development-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/jbake.properties
rename to docs/application-development-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/templates/footer.ftl b/docs/application-development-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/templates/footer.ftl
rename to docs/application-development-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/templates/header.ftl b/docs/application-development-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/templates/header.ftl
rename to docs/application-development-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/templates/menu.ftl b/docs/application-development-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/templates/menu.ftl
rename to docs/application-development-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/application-development-guide/src/main/jbake/templates/page.ftl b/docs/application-development-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/application-development-guide/src/main/jbake/templates/page.ftl
rename to docs/application-development-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/deployment-planning-guide/README.md b/docs/deployment-planning-guide/README.md
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/README.md
rename to docs/deployment-planning-guide/README.md
diff --git a/docs/glassfish/deployment-planning-guide/pom.xml b/docs/deployment-planning-guide/pom.xml
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/pom.xml
rename to docs/deployment-planning-guide/pom.xml
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/css/style.css b/docs/deployment-planning-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/assets/css/style.css
rename to docs/deployment-planning-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/deployment-planning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/deployment-planning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/checklist.adoc b/docs/deployment-planning-guide/src/main/jbake/content/checklist.adoc
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/content/checklist.adoc
rename to docs/deployment-planning-guide/src/main/jbake/content/checklist.adoc
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/concepts.adoc b/docs/deployment-planning-guide/src/main/jbake/content/concepts.adoc
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/content/concepts.adoc
rename to docs/deployment-planning-guide/src/main/jbake/content/concepts.adoc
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/loe.adoc b/docs/deployment-planning-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/content/loe.adoc
rename to docs/deployment-planning-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/lot.adoc b/docs/deployment-planning-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/content/lot.adoc
rename to docs/deployment-planning-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/planning.adoc b/docs/deployment-planning-guide/src/main/jbake/content/planning.adoc
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/content/planning.adoc
rename to docs/deployment-planning-guide/src/main/jbake/content/planning.adoc
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/preface.adoc b/docs/deployment-planning-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/content/preface.adoc
rename to docs/deployment-planning-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/title.adoc b/docs/deployment-planning-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/content/title.adoc
rename to docs/deployment-planning-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/content/toc.adoc b/docs/deployment-planning-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/content/toc.adoc
rename to docs/deployment-planning-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/jbake.properties b/docs/deployment-planning-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/jbake.properties
rename to docs/deployment-planning-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/templates/footer.ftl b/docs/deployment-planning-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/templates/footer.ftl
rename to docs/deployment-planning-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/templates/header.ftl b/docs/deployment-planning-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/templates/header.ftl
rename to docs/deployment-planning-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/templates/menu.ftl b/docs/deployment-planning-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/templates/menu.ftl
rename to docs/deployment-planning-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/deployment-planning-guide/src/main/jbake/templates/page.ftl b/docs/deployment-planning-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/deployment-planning-guide/src/main/jbake/templates/page.ftl
rename to docs/deployment-planning-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/distribution/pom.xml b/docs/distribution/pom.xml
similarity index 100%
rename from docs/glassfish/distribution/pom.xml
rename to docs/distribution/pom.xml
diff --git a/docs/glassfish/embedded-server-guide/README.md b/docs/embedded-server-guide/README.md
similarity index 100%
rename from docs/glassfish/embedded-server-guide/README.md
rename to docs/embedded-server-guide/README.md
diff --git a/docs/glassfish/embedded-server-guide/pom.xml b/docs/embedded-server-guide/pom.xml
similarity index 100%
rename from docs/glassfish/embedded-server-guide/pom.xml
rename to docs/embedded-server-guide/pom.xml
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/css/style.css b/docs/embedded-server-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/assets/css/style.css
rename to docs/embedded-server-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/embedded-server-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/embedded-server-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc b/docs/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc
rename to docs/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/content/loe.adoc b/docs/embedded-server-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/content/loe.adoc
rename to docs/embedded-server-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/content/lot.adoc b/docs/embedded-server-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/content/lot.adoc
rename to docs/embedded-server-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/content/preface.adoc b/docs/embedded-server-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/content/preface.adoc
rename to docs/embedded-server-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/content/title.adoc b/docs/embedded-server-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/content/title.adoc
rename to docs/embedded-server-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/content/toc.adoc b/docs/embedded-server-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/content/toc.adoc
rename to docs/embedded-server-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/jbake.properties b/docs/embedded-server-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/jbake.properties
rename to docs/embedded-server-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/templates/footer.ftl b/docs/embedded-server-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/templates/footer.ftl
rename to docs/embedded-server-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/templates/header.ftl b/docs/embedded-server-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/templates/header.ftl
rename to docs/embedded-server-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/templates/menu.ftl b/docs/embedded-server-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/templates/menu.ftl
rename to docs/embedded-server-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/embedded-server-guide/src/main/jbake/templates/page.ftl b/docs/embedded-server-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/embedded-server-guide/src/main/jbake/templates/page.ftl
rename to docs/embedded-server-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/error-messages-reference/README.md b/docs/error-messages-reference/README.md
similarity index 100%
rename from docs/glassfish/error-messages-reference/README.md
rename to docs/error-messages-reference/README.md
diff --git a/docs/glassfish/error-messages-reference/pom.xml b/docs/error-messages-reference/pom.xml
similarity index 100%
rename from docs/glassfish/error-messages-reference/pom.xml
rename to docs/error-messages-reference/pom.xml
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/css/style.css b/docs/error-messages-reference/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/assets/css/style.css
rename to docs/error-messages-reference/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/error-messages-reference/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/error-messages-reference/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/content/error-messages.adoc b/docs/error-messages-reference/src/main/jbake/content/error-messages.adoc
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/content/error-messages.adoc
rename to docs/error-messages-reference/src/main/jbake/content/error-messages.adoc
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/content/preface.adoc b/docs/error-messages-reference/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/content/preface.adoc
rename to docs/error-messages-reference/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/content/title.adoc b/docs/error-messages-reference/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/content/title.adoc
rename to docs/error-messages-reference/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/content/toc.adoc b/docs/error-messages-reference/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/content/toc.adoc
rename to docs/error-messages-reference/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/jbake.properties b/docs/error-messages-reference/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/jbake.properties
rename to docs/error-messages-reference/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/templates/footer.ftl b/docs/error-messages-reference/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/templates/footer.ftl
rename to docs/error-messages-reference/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/templates/header.ftl b/docs/error-messages-reference/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/templates/header.ftl
rename to docs/error-messages-reference/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/templates/menu.ftl b/docs/error-messages-reference/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/templates/menu.ftl
rename to docs/error-messages-reference/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/error-messages-reference/src/main/jbake/templates/page.ftl b/docs/error-messages-reference/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/error-messages-reference/src/main/jbake/templates/page.ftl
rename to docs/error-messages-reference/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/ha-administration-guide/README.md b/docs/ha-administration-guide/README.md
similarity index 100%
rename from docs/glassfish/ha-administration-guide/README.md
rename to docs/ha-administration-guide/README.md
diff --git a/docs/glassfish/ha-administration-guide/pom.xml b/docs/ha-administration-guide/pom.xml
similarity index 100%
rename from docs/glassfish/ha-administration-guide/pom.xml
rename to docs/ha-administration-guide/pom.xml
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/css/style.css b/docs/ha-administration-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/assets/css/style.css
rename to docs/ha-administration-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/ha-administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/ha-administration-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/clusters.adoc b/docs/ha-administration-guide/src/main/jbake/content/clusters.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/clusters.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/clusters.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/http-load-balancing.adoc b/docs/ha-administration-guide/src/main/jbake/content/http-load-balancing.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/http-load-balancing.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/http-load-balancing.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/instances.adoc b/docs/ha-administration-guide/src/main/jbake/content/instances.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/instances.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/instances.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/jms.adoc b/docs/ha-administration-guide/src/main/jbake/content/jms.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/jms.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/jms.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/loe.adoc b/docs/ha-administration-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/loe.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/named-configurations.adoc b/docs/ha-administration-guide/src/main/jbake/content/named-configurations.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/named-configurations.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/named-configurations.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/nodes.adoc b/docs/ha-administration-guide/src/main/jbake/content/nodes.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/nodes.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/nodes.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/overview.adoc b/docs/ha-administration-guide/src/main/jbake/content/overview.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/overview.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/overview.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/preface.adoc b/docs/ha-administration-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/preface.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc b/docs/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/rolling-upgrade.adoc b/docs/ha-administration-guide/src/main/jbake/content/rolling-upgrade.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/rolling-upgrade.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/rolling-upgrade.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc b/docs/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/ssh-setup.adoc b/docs/ha-administration-guide/src/main/jbake/content/ssh-setup.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/ssh-setup.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/ssh-setup.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/title.adoc b/docs/ha-administration-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/title.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/content/toc.adoc b/docs/ha-administration-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/content/toc.adoc
rename to docs/ha-administration-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/jbake.properties b/docs/ha-administration-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/jbake.properties
rename to docs/ha-administration-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/templates/footer.ftl b/docs/ha-administration-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/templates/footer.ftl
rename to docs/ha-administration-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/templates/header.ftl b/docs/ha-administration-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/templates/header.ftl
rename to docs/ha-administration-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/templates/menu.ftl b/docs/ha-administration-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/templates/menu.ftl
rename to docs/ha-administration-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/ha-administration-guide/src/main/jbake/templates/page.ftl b/docs/ha-administration-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/ha-administration-guide/src/main/jbake/templates/page.ftl
rename to docs/ha-administration-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/installation-guide/README.md b/docs/installation-guide/README.md
similarity index 100%
rename from docs/glassfish/installation-guide/README.md
rename to docs/installation-guide/README.md
diff --git a/docs/glassfish/installation-guide/pom.xml b/docs/installation-guide/pom.xml
similarity index 100%
rename from docs/glassfish/installation-guide/pom.xml
rename to docs/installation-guide/pom.xml
diff --git a/docs/glassfish/installation-guide/src/main/jbake/assets/css/style.css b/docs/installation-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/assets/css/style.css
rename to docs/installation-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/installation-guide/src/main/jbake/content/installing.adoc b/docs/installation-guide/src/main/jbake/content/installing.adoc
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/content/installing.adoc
rename to docs/installation-guide/src/main/jbake/content/installing.adoc
diff --git a/docs/glassfish/installation-guide/src/main/jbake/content/lot.adoc b/docs/installation-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/content/lot.adoc
rename to docs/installation-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/installation-guide/src/main/jbake/content/preface.adoc b/docs/installation-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/content/preface.adoc
rename to docs/installation-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/installation-guide/src/main/jbake/content/title.adoc b/docs/installation-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/content/title.adoc
rename to docs/installation-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/installation-guide/src/main/jbake/content/toc.adoc b/docs/installation-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/content/toc.adoc
rename to docs/installation-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/installation-guide/src/main/jbake/content/uninstalling.adoc b/docs/installation-guide/src/main/jbake/content/uninstalling.adoc
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/content/uninstalling.adoc
rename to docs/installation-guide/src/main/jbake/content/uninstalling.adoc
diff --git a/docs/glassfish/installation-guide/src/main/jbake/jbake.properties b/docs/installation-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/jbake.properties
rename to docs/installation-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/installation-guide/src/main/jbake/templates/footer.ftl b/docs/installation-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/templates/footer.ftl
rename to docs/installation-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/installation-guide/src/main/jbake/templates/header.ftl b/docs/installation-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/templates/header.ftl
rename to docs/installation-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/installation-guide/src/main/jbake/templates/menu.ftl b/docs/installation-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/templates/menu.ftl
rename to docs/installation-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/installation-guide/src/main/jbake/templates/page.ftl b/docs/installation-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/installation-guide/src/main/jbake/templates/page.ftl
rename to docs/installation-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/parent/pom.xml b/docs/parent/pom.xml
similarity index 100%
rename from docs/glassfish/parent/pom.xml
rename to docs/parent/pom.xml
diff --git a/docs/glassfish/parent/src/main/jbake/content/.gitkeep b/docs/parent/src/main/jbake/content/.gitkeep
similarity index 100%
rename from docs/glassfish/parent/src/main/jbake/content/.gitkeep
rename to docs/parent/src/main/jbake/content/.gitkeep
diff --git a/docs/glassfish/parent/src/main/jbake/jbake.properties b/docs/parent/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/parent/src/main/jbake/jbake.properties
rename to docs/parent/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/parent/src/main/jbake/templates/.gitkeep b/docs/parent/src/main/jbake/templates/.gitkeep
similarity index 100%
rename from docs/glassfish/parent/src/main/jbake/templates/.gitkeep
rename to docs/parent/src/main/jbake/templates/.gitkeep
diff --git a/docs/glassfish/performance-tuning-guide/README.md b/docs/performance-tuning-guide/README.md
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/README.md
rename to docs/performance-tuning-guide/README.md
diff --git a/docs/glassfish/performance-tuning-guide/pom.xml b/docs/performance-tuning-guide/pom.xml
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/pom.xml
rename to docs/performance-tuning-guide/pom.xml
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/css/style.css b/docs/performance-tuning-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/assets/css/style.css
rename to docs/performance-tuning-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/img/appmodel.png b/docs/performance-tuning-guide/src/main/jbake/assets/img/appmodel.png
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/assets/img/appmodel.png
rename to docs/performance-tuning-guide/src/main/jbake/assets/img/appmodel.png
Binary files differ
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/performance-tuning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/performance-tuning-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/loe.adoc b/docs/performance-tuning-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/loe.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/lof.adoc b/docs/performance-tuning-guide/src/main/jbake/content/lof.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/lof.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/lof.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/lot.adoc b/docs/performance-tuning-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/lot.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/overview.adoc b/docs/performance-tuning-guide/src/main/jbake/content/overview.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/overview.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/overview.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/preface.adoc b/docs/performance-tuning-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/preface.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/title.adoc b/docs/performance-tuning-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/title.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/toc.adoc b/docs/performance-tuning-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/toc.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/tuning-apps.adoc b/docs/performance-tuning-guide/src/main/jbake/content/tuning-apps.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/tuning-apps.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/tuning-apps.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/tuning-glassfish.adoc b/docs/performance-tuning-guide/src/main/jbake/content/tuning-glassfish.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/tuning-glassfish.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/tuning-glassfish.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/tuning-java.adoc b/docs/performance-tuning-guide/src/main/jbake/content/tuning-java.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/tuning-java.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/tuning-java.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/content/tuning-os.adoc b/docs/performance-tuning-guide/src/main/jbake/content/tuning-os.adoc
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/content/tuning-os.adoc
rename to docs/performance-tuning-guide/src/main/jbake/content/tuning-os.adoc
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/jbake.properties b/docs/performance-tuning-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/jbake.properties
rename to docs/performance-tuning-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/templates/footer.ftl b/docs/performance-tuning-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/templates/footer.ftl
rename to docs/performance-tuning-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/templates/header.ftl b/docs/performance-tuning-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/templates/header.ftl
rename to docs/performance-tuning-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/templates/menu.ftl b/docs/performance-tuning-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/templates/menu.ftl
rename to docs/performance-tuning-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/performance-tuning-guide/src/main/jbake/templates/page.ftl b/docs/performance-tuning-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/performance-tuning-guide/src/main/jbake/templates/page.ftl
rename to docs/performance-tuning-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/pom.xml b/docs/pom.xml
similarity index 100%
rename from docs/glassfish/pom.xml
rename to docs/pom.xml
diff --git a/docs/glassfish/publish/pom.xml b/docs/publish/pom.xml
similarity index 100%
rename from docs/glassfish/publish/pom.xml
rename to docs/publish/pom.xml
diff --git a/docs/glassfish/quick-start-guide/README.md b/docs/quick-start-guide/README.md
similarity index 100%
rename from docs/glassfish/quick-start-guide/README.md
rename to docs/quick-start-guide/README.md
diff --git a/docs/glassfish/quick-start-guide/pom.xml b/docs/quick-start-guide/pom.xml
similarity index 100%
rename from docs/glassfish/quick-start-guide/pom.xml
rename to docs/quick-start-guide/pom.xml
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/css/style.css b/docs/quick-start-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/assets/css/style.css
rename to docs/quick-start-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/quick-start-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/quick-start-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/img/oracle-db-config.png b/docs/quick-start-guide/src/main/jbake/assets/img/oracle-db-config.png
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/assets/img/oracle-db-config.png
rename to docs/quick-start-guide/src/main/jbake/assets/img/oracle-db-config.png
Binary files differ
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/assets/img/two-instance-cluster-config.png b/docs/quick-start-guide/src/main/jbake/assets/img/two-instance-cluster-config.png
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/assets/img/two-instance-cluster-config.png
rename to docs/quick-start-guide/src/main/jbake/assets/img/two-instance-cluster-config.png
Binary files differ
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/content/basic-features.adoc b/docs/quick-start-guide/src/main/jbake/content/basic-features.adoc
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/content/basic-features.adoc
rename to docs/quick-start-guide/src/main/jbake/content/basic-features.adoc
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/content/preface.adoc b/docs/quick-start-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/content/preface.adoc
rename to docs/quick-start-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/content/title.adoc b/docs/quick-start-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/content/title.adoc
rename to docs/quick-start-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/content/toc.adoc b/docs/quick-start-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/content/toc.adoc
rename to docs/quick-start-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/jbake.properties b/docs/quick-start-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/jbake.properties
rename to docs/quick-start-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/templates/footer.ftl b/docs/quick-start-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/templates/footer.ftl
rename to docs/quick-start-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/templates/header.ftl b/docs/quick-start-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/templates/header.ftl
rename to docs/quick-start-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/templates/menu.ftl b/docs/quick-start-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/templates/menu.ftl
rename to docs/quick-start-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/quick-start-guide/src/main/jbake/templates/page.ftl b/docs/quick-start-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/quick-start-guide/src/main/jbake/templates/page.ftl
rename to docs/quick-start-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/reference-manual/README.md b/docs/reference-manual/README.md
similarity index 100%
rename from docs/glassfish/reference-manual/README.md
rename to docs/reference-manual/README.md
diff --git a/docs/glassfish/reference-manual/pom.xml b/docs/reference-manual/pom.xml
similarity index 100%
rename from docs/glassfish/reference-manual/pom.xml
rename to docs/reference-manual/pom.xml
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/css/style.css b/docs/reference-manual/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/assets/css/style.css
rename to docs/reference-manual/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/reference-manual/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/reference-manual/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/reference-manual/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/add-library.adoc b/docs/reference-manual/src/main/jbake/content/add-library.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/add-library.adoc
rename to docs/reference-manual/src/main/jbake/content/add-library.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/add-resources.adoc b/docs/reference-manual/src/main/jbake/content/add-resources.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/add-resources.adoc
rename to docs/reference-manual/src/main/jbake/content/add-resources.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/appclient.adoc b/docs/reference-manual/src/main/jbake/content/appclient.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/appclient.adoc
rename to docs/reference-manual/src/main/jbake/content/appclient.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/application.adoc b/docs/reference-manual/src/main/jbake/content/application.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/application.adoc
rename to docs/reference-manual/src/main/jbake/content/application.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/apply-http-lb-changes.adoc b/docs/reference-manual/src/main/jbake/content/apply-http-lb-changes.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/apply-http-lb-changes.adoc
rename to docs/reference-manual/src/main/jbake/content/apply-http-lb-changes.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/asadmin.adoc b/docs/reference-manual/src/main/jbake/content/asadmin.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/asadmin.adoc
rename to docs/reference-manual/src/main/jbake/content/asadmin.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/attach.adoc b/docs/reference-manual/src/main/jbake/content/attach.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/attach.adoc
rename to docs/reference-manual/src/main/jbake/content/attach.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/backup-domain.adoc b/docs/reference-manual/src/main/jbake/content/backup-domain.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/backup-domain.adoc
rename to docs/reference-manual/src/main/jbake/content/backup-domain.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/capture-schema.adoc b/docs/reference-manual/src/main/jbake/content/capture-schema.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/capture-schema.adoc
rename to docs/reference-manual/src/main/jbake/content/capture-schema.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/change-admin-password.adoc b/docs/reference-manual/src/main/jbake/content/change-admin-password.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/change-admin-password.adoc
rename to docs/reference-manual/src/main/jbake/content/change-admin-password.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/change-master-broker.adoc b/docs/reference-manual/src/main/jbake/content/change-master-broker.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/change-master-broker.adoc
rename to docs/reference-manual/src/main/jbake/content/change-master-broker.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/change-master-password.adoc b/docs/reference-manual/src/main/jbake/content/change-master-password.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/change-master-password.adoc
rename to docs/reference-manual/src/main/jbake/content/change-master-password.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/collect-log-files.adoc b/docs/reference-manual/src/main/jbake/content/collect-log-files.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/collect-log-files.adoc
rename to docs/reference-manual/src/main/jbake/content/collect-log-files.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/configuration.adoc b/docs/reference-manual/src/main/jbake/content/configuration.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/configuration.adoc
rename to docs/reference-manual/src/main/jbake/content/configuration.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/configure-jms-cluster.adoc b/docs/reference-manual/src/main/jbake/content/configure-jms-cluster.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/configure-jms-cluster.adoc
rename to docs/reference-manual/src/main/jbake/content/configure-jms-cluster.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/configure-lb-weight.adoc b/docs/reference-manual/src/main/jbake/content/configure-lb-weight.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/configure-lb-weight.adoc
rename to docs/reference-manual/src/main/jbake/content/configure-lb-weight.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc b/docs/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc
rename to docs/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/configure-managed-jobs.adoc b/docs/reference-manual/src/main/jbake/content/configure-managed-jobs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/configure-managed-jobs.adoc
rename to docs/reference-manual/src/main/jbake/content/configure-managed-jobs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/copy-config.adoc b/docs/reference-manual/src/main/jbake/content/copy-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/copy-config.adoc
rename to docs/reference-manual/src/main/jbake/content/copy-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-admin-object.adoc b/docs/reference-manual/src/main/jbake/content/create-admin-object.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-admin-object.adoc
rename to docs/reference-manual/src/main/jbake/content/create-admin-object.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-application-ref.adoc b/docs/reference-manual/src/main/jbake/content/create-application-ref.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-application-ref.adoc
rename to docs/reference-manual/src/main/jbake/content/create-application-ref.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-audit-module.adoc b/docs/reference-manual/src/main/jbake/content/create-audit-module.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-audit-module.adoc
rename to docs/reference-manual/src/main/jbake/content/create-audit-module.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-auth-realm.adoc b/docs/reference-manual/src/main/jbake/content/create-auth-realm.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-auth-realm.adoc
rename to docs/reference-manual/src/main/jbake/content/create-auth-realm.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-cluster.adoc b/docs/reference-manual/src/main/jbake/content/create-cluster.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-cluster.adoc
rename to docs/reference-manual/src/main/jbake/content/create-cluster.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-connector-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/create-connector-connection-pool.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-connector-connection-pool.adoc
rename to docs/reference-manual/src/main/jbake/content/create-connector-connection-pool.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-connector-resource.adoc b/docs/reference-manual/src/main/jbake/content/create-connector-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-connector-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/create-connector-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-connector-security-map.adoc b/docs/reference-manual/src/main/jbake/content/create-connector-security-map.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-connector-security-map.adoc
rename to docs/reference-manual/src/main/jbake/content/create-connector-security-map.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc b/docs/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc
rename to docs/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-context-service.adoc b/docs/reference-manual/src/main/jbake/content/create-context-service.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-context-service.adoc
rename to docs/reference-manual/src/main/jbake/content/create-context-service.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-custom-resource.adoc b/docs/reference-manual/src/main/jbake/content/create-custom-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-custom-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/create-custom-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-domain.adoc b/docs/reference-manual/src/main/jbake/content/create-domain.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-domain.adoc
rename to docs/reference-manual/src/main/jbake/content/create-domain.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-file-user.adoc b/docs/reference-manual/src/main/jbake/content/create-file-user.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-file-user.adoc
rename to docs/reference-manual/src/main/jbake/content/create-file-user.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-http-health-checker.adoc b/docs/reference-manual/src/main/jbake/content/create-http-health-checker.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-http-health-checker.adoc
rename to docs/reference-manual/src/main/jbake/content/create-http-health-checker.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-http-lb-config.adoc b/docs/reference-manual/src/main/jbake/content/create-http-lb-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-http-lb-config.adoc
rename to docs/reference-manual/src/main/jbake/content/create-http-lb-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc b/docs/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc
rename to docs/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-http-lb.adoc b/docs/reference-manual/src/main/jbake/content/create-http-lb.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-http-lb.adoc
rename to docs/reference-manual/src/main/jbake/content/create-http-lb.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-http-listener.adoc b/docs/reference-manual/src/main/jbake/content/create-http-listener.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-http-listener.adoc
rename to docs/reference-manual/src/main/jbake/content/create-http-listener.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-http-redirect.adoc b/docs/reference-manual/src/main/jbake/content/create-http-redirect.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-http-redirect.adoc
rename to docs/reference-manual/src/main/jbake/content/create-http-redirect.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-http.adoc b/docs/reference-manual/src/main/jbake/content/create-http.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-http.adoc
rename to docs/reference-manual/src/main/jbake/content/create-http.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-iiop-listener.adoc b/docs/reference-manual/src/main/jbake/content/create-iiop-listener.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-iiop-listener.adoc
rename to docs/reference-manual/src/main/jbake/content/create-iiop-listener.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-instance.adoc b/docs/reference-manual/src/main/jbake/content/create-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/create-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-jacc-provider.adoc b/docs/reference-manual/src/main/jbake/content/create-jacc-provider.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-jacc-provider.adoc
rename to docs/reference-manual/src/main/jbake/content/create-jacc-provider.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-javamail-resource.adoc b/docs/reference-manual/src/main/jbake/content/create-javamail-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-javamail-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/create-javamail-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc
rename to docs/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-jdbc-resource.adoc b/docs/reference-manual/src/main/jbake/content/create-jdbc-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-jdbc-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/create-jdbc-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-jms-host.adoc b/docs/reference-manual/src/main/jbake/content/create-jms-host.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-jms-host.adoc
rename to docs/reference-manual/src/main/jbake/content/create-jms-host.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-jms-resource.adoc b/docs/reference-manual/src/main/jbake/content/create-jms-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-jms-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/create-jms-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-jmsdest.adoc b/docs/reference-manual/src/main/jbake/content/create-jmsdest.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-jmsdest.adoc
rename to docs/reference-manual/src/main/jbake/content/create-jmsdest.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-jndi-resource.adoc b/docs/reference-manual/src/main/jbake/content/create-jndi-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-jndi-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/create-jndi-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-jvm-options.adoc b/docs/reference-manual/src/main/jbake/content/create-jvm-options.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-jvm-options.adoc
rename to docs/reference-manual/src/main/jbake/content/create-jvm-options.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-lifecycle-module.adoc b/docs/reference-manual/src/main/jbake/content/create-lifecycle-module.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-lifecycle-module.adoc
rename to docs/reference-manual/src/main/jbake/content/create-lifecycle-module.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-local-instance.adoc b/docs/reference-manual/src/main/jbake/content/create-local-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-local-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/create-local-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-managed-executor-service.adoc b/docs/reference-manual/src/main/jbake/content/create-managed-executor-service.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-managed-executor-service.adoc
rename to docs/reference-manual/src/main/jbake/content/create-managed-executor-service.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-managed-scheduled-executor-service.adoc b/docs/reference-manual/src/main/jbake/content/create-managed-scheduled-executor-service.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-managed-scheduled-executor-service.adoc
rename to docs/reference-manual/src/main/jbake/content/create-managed-scheduled-executor-service.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-managed-thread-factory.adoc b/docs/reference-manual/src/main/jbake/content/create-managed-thread-factory.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-managed-thread-factory.adoc
rename to docs/reference-manual/src/main/jbake/content/create-managed-thread-factory.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-message-security-provider.adoc b/docs/reference-manual/src/main/jbake/content/create-message-security-provider.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-message-security-provider.adoc
rename to docs/reference-manual/src/main/jbake/content/create-message-security-provider.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-module-config.adoc b/docs/reference-manual/src/main/jbake/content/create-module-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-module-config.adoc
rename to docs/reference-manual/src/main/jbake/content/create-module-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-network-listener.adoc b/docs/reference-manual/src/main/jbake/content/create-network-listener.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-network-listener.adoc
rename to docs/reference-manual/src/main/jbake/content/create-network-listener.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-node-config.adoc b/docs/reference-manual/src/main/jbake/content/create-node-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-node-config.adoc
rename to docs/reference-manual/src/main/jbake/content/create-node-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-node-dcom.adoc b/docs/reference-manual/src/main/jbake/content/create-node-dcom.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-node-dcom.adoc
rename to docs/reference-manual/src/main/jbake/content/create-node-dcom.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-node-ssh.adoc b/docs/reference-manual/src/main/jbake/content/create-node-ssh.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-node-ssh.adoc
rename to docs/reference-manual/src/main/jbake/content/create-node-ssh.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-password-alias.adoc b/docs/reference-manual/src/main/jbake/content/create-password-alias.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-password-alias.adoc
rename to docs/reference-manual/src/main/jbake/content/create-password-alias.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-profiler.adoc b/docs/reference-manual/src/main/jbake/content/create-profiler.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-profiler.adoc
rename to docs/reference-manual/src/main/jbake/content/create-profiler.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-protocol-filter.adoc b/docs/reference-manual/src/main/jbake/content/create-protocol-filter.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-protocol-filter.adoc
rename to docs/reference-manual/src/main/jbake/content/create-protocol-filter.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-protocol-finder.adoc b/docs/reference-manual/src/main/jbake/content/create-protocol-finder.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-protocol-finder.adoc
rename to docs/reference-manual/src/main/jbake/content/create-protocol-finder.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-protocol.adoc b/docs/reference-manual/src/main/jbake/content/create-protocol.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-protocol.adoc
rename to docs/reference-manual/src/main/jbake/content/create-protocol.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc b/docs/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc
rename to docs/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-resource-ref.adoc b/docs/reference-manual/src/main/jbake/content/create-resource-ref.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-resource-ref.adoc
rename to docs/reference-manual/src/main/jbake/content/create-resource-ref.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-service.adoc b/docs/reference-manual/src/main/jbake/content/create-service.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-service.adoc
rename to docs/reference-manual/src/main/jbake/content/create-service.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-ssl.adoc b/docs/reference-manual/src/main/jbake/content/create-ssl.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-ssl.adoc
rename to docs/reference-manual/src/main/jbake/content/create-ssl.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-system-properties.adoc b/docs/reference-manual/src/main/jbake/content/create-system-properties.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-system-properties.adoc
rename to docs/reference-manual/src/main/jbake/content/create-system-properties.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-threadpool.adoc b/docs/reference-manual/src/main/jbake/content/create-threadpool.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-threadpool.adoc
rename to docs/reference-manual/src/main/jbake/content/create-threadpool.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-transport.adoc b/docs/reference-manual/src/main/jbake/content/create-transport.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-transport.adoc
rename to docs/reference-manual/src/main/jbake/content/create-transport.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/create-virtual-server.adoc b/docs/reference-manual/src/main/jbake/content/create-virtual-server.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/create-virtual-server.adoc
rename to docs/reference-manual/src/main/jbake/content/create-virtual-server.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-admin-object.adoc b/docs/reference-manual/src/main/jbake/content/delete-admin-object.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-admin-object.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-admin-object.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-application-ref.adoc b/docs/reference-manual/src/main/jbake/content/delete-application-ref.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-application-ref.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-application-ref.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-audit-module.adoc b/docs/reference-manual/src/main/jbake/content/delete-audit-module.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-audit-module.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-audit-module.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-auth-realm.adoc b/docs/reference-manual/src/main/jbake/content/delete-auth-realm.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-auth-realm.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-auth-realm.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-cluster.adoc b/docs/reference-manual/src/main/jbake/content/delete-cluster.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-cluster.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-cluster.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-config.adoc b/docs/reference-manual/src/main/jbake/content/delete-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-config.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-connector-resource.adoc b/docs/reference-manual/src/main/jbake/content/delete-connector-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-connector-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-connector-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-connector-security-map.adoc b/docs/reference-manual/src/main/jbake/content/delete-connector-security-map.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-connector-security-map.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-connector-security-map.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc b/docs/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-context-service.adoc b/docs/reference-manual/src/main/jbake/content/delete-context-service.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-context-service.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-context-service.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-custom-resource.adoc b/docs/reference-manual/src/main/jbake/content/delete-custom-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-custom-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-custom-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-domain.adoc b/docs/reference-manual/src/main/jbake/content/delete-domain.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-domain.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-domain.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-file-user.adoc b/docs/reference-manual/src/main/jbake/content/delete-file-user.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-file-user.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-file-user.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-http-health-checker.adoc b/docs/reference-manual/src/main/jbake/content/delete-http-health-checker.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-http-health-checker.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-http-health-checker.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-http-lb-config.adoc b/docs/reference-manual/src/main/jbake/content/delete-http-lb-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-http-lb-config.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-http-lb-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-http-lb-ref.adoc b/docs/reference-manual/src/main/jbake/content/delete-http-lb-ref.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-http-lb-ref.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-http-lb-ref.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-http-lb.adoc b/docs/reference-manual/src/main/jbake/content/delete-http-lb.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-http-lb.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-http-lb.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-http-listener.adoc b/docs/reference-manual/src/main/jbake/content/delete-http-listener.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-http-listener.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-http-listener.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-http-redirect.adoc b/docs/reference-manual/src/main/jbake/content/delete-http-redirect.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-http-redirect.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-http-redirect.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-http.adoc b/docs/reference-manual/src/main/jbake/content/delete-http.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-http.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-http.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-iiop-listener.adoc b/docs/reference-manual/src/main/jbake/content/delete-iiop-listener.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-iiop-listener.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-iiop-listener.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-instance.adoc b/docs/reference-manual/src/main/jbake/content/delete-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-jacc-provider.adoc b/docs/reference-manual/src/main/jbake/content/delete-jacc-provider.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-jacc-provider.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-jacc-provider.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-javamail-resource.adoc b/docs/reference-manual/src/main/jbake/content/delete-javamail-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-javamail-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-javamail-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-jdbc-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/delete-jdbc-connection-pool.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-jdbc-connection-pool.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-jdbc-connection-pool.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-jdbc-resource.adoc b/docs/reference-manual/src/main/jbake/content/delete-jdbc-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-jdbc-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-jdbc-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-jms-host.adoc b/docs/reference-manual/src/main/jbake/content/delete-jms-host.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-jms-host.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-jms-host.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-jms-resource.adoc b/docs/reference-manual/src/main/jbake/content/delete-jms-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-jms-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-jms-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-jmsdest.adoc b/docs/reference-manual/src/main/jbake/content/delete-jmsdest.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-jmsdest.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-jmsdest.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-jndi-resource.adoc b/docs/reference-manual/src/main/jbake/content/delete-jndi-resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-jndi-resource.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-jndi-resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-jvm-options.adoc b/docs/reference-manual/src/main/jbake/content/delete-jvm-options.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-jvm-options.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-jvm-options.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-lifecycle-module.adoc b/docs/reference-manual/src/main/jbake/content/delete-lifecycle-module.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-lifecycle-module.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-lifecycle-module.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-local-instance.adoc b/docs/reference-manual/src/main/jbake/content/delete-local-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-local-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-local-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-managed-executor-service.adoc b/docs/reference-manual/src/main/jbake/content/delete-managed-executor-service.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-managed-executor-service.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-managed-executor-service.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-managed-scheduled-executor-service.adoc b/docs/reference-manual/src/main/jbake/content/delete-managed-scheduled-executor-service.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-managed-scheduled-executor-service.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-managed-scheduled-executor-service.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-managed-thread-factory.adoc b/docs/reference-manual/src/main/jbake/content/delete-managed-thread-factory.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-managed-thread-factory.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-managed-thread-factory.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-message-security-provider.adoc b/docs/reference-manual/src/main/jbake/content/delete-message-security-provider.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-message-security-provider.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-message-security-provider.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-module-config.adoc b/docs/reference-manual/src/main/jbake/content/delete-module-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-module-config.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-module-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-network-listener.adoc b/docs/reference-manual/src/main/jbake/content/delete-network-listener.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-network-listener.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-network-listener.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-node-config.adoc b/docs/reference-manual/src/main/jbake/content/delete-node-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-node-config.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-node-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-node-dcom.adoc b/docs/reference-manual/src/main/jbake/content/delete-node-dcom.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-node-dcom.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-node-dcom.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-node-ssh.adoc b/docs/reference-manual/src/main/jbake/content/delete-node-ssh.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-node-ssh.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-node-ssh.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-password-alias.adoc b/docs/reference-manual/src/main/jbake/content/delete-password-alias.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-password-alias.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-password-alias.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-profiler.adoc b/docs/reference-manual/src/main/jbake/content/delete-profiler.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-profiler.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-profiler.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-protocol-filter.adoc b/docs/reference-manual/src/main/jbake/content/delete-protocol-filter.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-protocol-filter.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-protocol-filter.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-protocol-finder.adoc b/docs/reference-manual/src/main/jbake/content/delete-protocol-finder.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-protocol-finder.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-protocol-finder.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-protocol.adoc b/docs/reference-manual/src/main/jbake/content/delete-protocol.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-protocol.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-protocol.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc b/docs/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-resource-ref.adoc b/docs/reference-manual/src/main/jbake/content/delete-resource-ref.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-resource-ref.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-resource-ref.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-ssl.adoc b/docs/reference-manual/src/main/jbake/content/delete-ssl.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-ssl.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-ssl.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-system-property.adoc b/docs/reference-manual/src/main/jbake/content/delete-system-property.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-system-property.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-system-property.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-threadpool.adoc b/docs/reference-manual/src/main/jbake/content/delete-threadpool.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-threadpool.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-threadpool.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-transport.adoc b/docs/reference-manual/src/main/jbake/content/delete-transport.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-transport.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-transport.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/delete-virtual-server.adoc b/docs/reference-manual/src/main/jbake/content/delete-virtual-server.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/delete-virtual-server.adoc
rename to docs/reference-manual/src/main/jbake/content/delete-virtual-server.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/deploy.adoc b/docs/reference-manual/src/main/jbake/content/deploy.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/deploy.adoc
rename to docs/reference-manual/src/main/jbake/content/deploy.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/deploydir.adoc b/docs/reference-manual/src/main/jbake/content/deploydir.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/deploydir.adoc
rename to docs/reference-manual/src/main/jbake/content/deploydir.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/disable-http-lb-application.adoc b/docs/reference-manual/src/main/jbake/content/disable-http-lb-application.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/disable-http-lb-application.adoc
rename to docs/reference-manual/src/main/jbake/content/disable-http-lb-application.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/disable-http-lb-server.adoc b/docs/reference-manual/src/main/jbake/content/disable-http-lb-server.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/disable-http-lb-server.adoc
rename to docs/reference-manual/src/main/jbake/content/disable-http-lb-server.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/disable-monitoring.adoc b/docs/reference-manual/src/main/jbake/content/disable-monitoring.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/disable-monitoring.adoc
rename to docs/reference-manual/src/main/jbake/content/disable-monitoring.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc b/docs/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc
rename to docs/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc b/docs/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc
rename to docs/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/disable-secure-admin.adoc b/docs/reference-manual/src/main/jbake/content/disable-secure-admin.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/disable-secure-admin.adoc
rename to docs/reference-manual/src/main/jbake/content/disable-secure-admin.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/disable.adoc b/docs/reference-manual/src/main/jbake/content/disable.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/disable.adoc
rename to docs/reference-manual/src/main/jbake/content/disable.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/domain.adoc b/docs/reference-manual/src/main/jbake/content/domain.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/domain.adoc
rename to docs/reference-manual/src/main/jbake/content/domain.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/dotted-names.adoc b/docs/reference-manual/src/main/jbake/content/dotted-names.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/dotted-names.adoc
rename to docs/reference-manual/src/main/jbake/content/dotted-names.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/enable-http-lb-application.adoc b/docs/reference-manual/src/main/jbake/content/enable-http-lb-application.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/enable-http-lb-application.adoc
rename to docs/reference-manual/src/main/jbake/content/enable-http-lb-application.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/enable-http-lb-server.adoc b/docs/reference-manual/src/main/jbake/content/enable-http-lb-server.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/enable-http-lb-server.adoc
rename to docs/reference-manual/src/main/jbake/content/enable-http-lb-server.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/enable-monitoring.adoc b/docs/reference-manual/src/main/jbake/content/enable-monitoring.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/enable-monitoring.adoc
rename to docs/reference-manual/src/main/jbake/content/enable-monitoring.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc b/docs/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc
rename to docs/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc b/docs/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc
rename to docs/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/enable-secure-admin.adoc b/docs/reference-manual/src/main/jbake/content/enable-secure-admin.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/enable-secure-admin.adoc
rename to docs/reference-manual/src/main/jbake/content/enable-secure-admin.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/enable.adoc b/docs/reference-manual/src/main/jbake/content/enable.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/enable.adoc
rename to docs/reference-manual/src/main/jbake/content/enable.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/export-http-lb-config.adoc b/docs/reference-manual/src/main/jbake/content/export-http-lb-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/export-http-lb-config.adoc
rename to docs/reference-manual/src/main/jbake/content/export-http-lb-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/export-sync-bundle.adoc b/docs/reference-manual/src/main/jbake/content/export-sync-bundle.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/export-sync-bundle.adoc
rename to docs/reference-manual/src/main/jbake/content/export-sync-bundle.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/export.adoc b/docs/reference-manual/src/main/jbake/content/export.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/export.adoc
rename to docs/reference-manual/src/main/jbake/content/export.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/flush-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/flush-connection-pool.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/flush-connection-pool.adoc
rename to docs/reference-manual/src/main/jbake/content/flush-connection-pool.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/flush-jmsdest.adoc b/docs/reference-manual/src/main/jbake/content/flush-jmsdest.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/flush-jmsdest.adoc
rename to docs/reference-manual/src/main/jbake/content/flush-jmsdest.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc b/docs/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc
rename to docs/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/generate-jvm-report.adoc b/docs/reference-manual/src/main/jbake/content/generate-jvm-report.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/generate-jvm-report.adoc
rename to docs/reference-manual/src/main/jbake/content/generate-jvm-report.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/get-active-module-config.adoc b/docs/reference-manual/src/main/jbake/content/get-active-module-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/get-active-module-config.adoc
rename to docs/reference-manual/src/main/jbake/content/get-active-module-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/get-client-stubs.adoc b/docs/reference-manual/src/main/jbake/content/get-client-stubs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/get-client-stubs.adoc
rename to docs/reference-manual/src/main/jbake/content/get-client-stubs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/get-health.adoc b/docs/reference-manual/src/main/jbake/content/get-health.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/get-health.adoc
rename to docs/reference-manual/src/main/jbake/content/get-health.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/get.adoc b/docs/reference-manual/src/main/jbake/content/get.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/get.adoc
rename to docs/reference-manual/src/main/jbake/content/get.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/import-sync-bundle.adoc b/docs/reference-manual/src/main/jbake/content/import-sync-bundle.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/import-sync-bundle.adoc
rename to docs/reference-manual/src/main/jbake/content/import-sync-bundle.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/install-node-dcom.adoc b/docs/reference-manual/src/main/jbake/content/install-node-dcom.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/install-node-dcom.adoc
rename to docs/reference-manual/src/main/jbake/content/install-node-dcom.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/install-node-ssh.adoc b/docs/reference-manual/src/main/jbake/content/install-node-ssh.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/install-node-ssh.adoc
rename to docs/reference-manual/src/main/jbake/content/install-node-ssh.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/install-node.adoc b/docs/reference-manual/src/main/jbake/content/install-node.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/install-node.adoc
rename to docs/reference-manual/src/main/jbake/content/install-node.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/instance.adoc b/docs/reference-manual/src/main/jbake/content/instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/instance.adoc
rename to docs/reference-manual/src/main/jbake/content/instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/jms-ping.adoc b/docs/reference-manual/src/main/jbake/content/jms-ping.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/jms-ping.adoc
rename to docs/reference-manual/src/main/jbake/content/jms-ping.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-admin-objects.adoc b/docs/reference-manual/src/main/jbake/content/list-admin-objects.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-admin-objects.adoc
rename to docs/reference-manual/src/main/jbake/content/list-admin-objects.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-application-refs.adoc b/docs/reference-manual/src/main/jbake/content/list-application-refs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-application-refs.adoc
rename to docs/reference-manual/src/main/jbake/content/list-application-refs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-applications.adoc b/docs/reference-manual/src/main/jbake/content/list-applications.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-applications.adoc
rename to docs/reference-manual/src/main/jbake/content/list-applications.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-audit-modules.adoc b/docs/reference-manual/src/main/jbake/content/list-audit-modules.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-audit-modules.adoc
rename to docs/reference-manual/src/main/jbake/content/list-audit-modules.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-auth-realms.adoc b/docs/reference-manual/src/main/jbake/content/list-auth-realms.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-auth-realms.adoc
rename to docs/reference-manual/src/main/jbake/content/list-auth-realms.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-backups.adoc b/docs/reference-manual/src/main/jbake/content/list-backups.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-backups.adoc
rename to docs/reference-manual/src/main/jbake/content/list-backups.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-batch-job-executions.adoc b/docs/reference-manual/src/main/jbake/content/list-batch-job-executions.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-batch-job-executions.adoc
rename to docs/reference-manual/src/main/jbake/content/list-batch-job-executions.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-batch-job-steps.adoc b/docs/reference-manual/src/main/jbake/content/list-batch-job-steps.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-batch-job-steps.adoc
rename to docs/reference-manual/src/main/jbake/content/list-batch-job-steps.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-batch-jobs.adoc b/docs/reference-manual/src/main/jbake/content/list-batch-jobs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-batch-jobs.adoc
rename to docs/reference-manual/src/main/jbake/content/list-batch-jobs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-batch-runtime-configuration.adoc b/docs/reference-manual/src/main/jbake/content/list-batch-runtime-configuration.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-batch-runtime-configuration.adoc
rename to docs/reference-manual/src/main/jbake/content/list-batch-runtime-configuration.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-clusters.adoc b/docs/reference-manual/src/main/jbake/content/list-clusters.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-clusters.adoc
rename to docs/reference-manual/src/main/jbake/content/list-clusters.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-commands.adoc b/docs/reference-manual/src/main/jbake/content/list-commands.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-commands.adoc
rename to docs/reference-manual/src/main/jbake/content/list-commands.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-components.adoc b/docs/reference-manual/src/main/jbake/content/list-components.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-components.adoc
rename to docs/reference-manual/src/main/jbake/content/list-components.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-configs.adoc b/docs/reference-manual/src/main/jbake/content/list-configs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-configs.adoc
rename to docs/reference-manual/src/main/jbake/content/list-configs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-connector-connection-pools.adoc b/docs/reference-manual/src/main/jbake/content/list-connector-connection-pools.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-connector-connection-pools.adoc
rename to docs/reference-manual/src/main/jbake/content/list-connector-connection-pools.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-connector-resources.adoc b/docs/reference-manual/src/main/jbake/content/list-connector-resources.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-connector-resources.adoc
rename to docs/reference-manual/src/main/jbake/content/list-connector-resources.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-connector-security-maps.adoc b/docs/reference-manual/src/main/jbake/content/list-connector-security-maps.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-connector-security-maps.adoc
rename to docs/reference-manual/src/main/jbake/content/list-connector-security-maps.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc b/docs/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc
rename to docs/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-containers.adoc b/docs/reference-manual/src/main/jbake/content/list-containers.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-containers.adoc
rename to docs/reference-manual/src/main/jbake/content/list-containers.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-context-services.adoc b/docs/reference-manual/src/main/jbake/content/list-context-services.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-context-services.adoc
rename to docs/reference-manual/src/main/jbake/content/list-context-services.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-custom-resources.adoc b/docs/reference-manual/src/main/jbake/content/list-custom-resources.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-custom-resources.adoc
rename to docs/reference-manual/src/main/jbake/content/list-custom-resources.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-domains.adoc b/docs/reference-manual/src/main/jbake/content/list-domains.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-domains.adoc
rename to docs/reference-manual/src/main/jbake/content/list-domains.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-file-groups.adoc b/docs/reference-manual/src/main/jbake/content/list-file-groups.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-file-groups.adoc
rename to docs/reference-manual/src/main/jbake/content/list-file-groups.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-file-users.adoc b/docs/reference-manual/src/main/jbake/content/list-file-users.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-file-users.adoc
rename to docs/reference-manual/src/main/jbake/content/list-file-users.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-http-lb-configs.adoc b/docs/reference-manual/src/main/jbake/content/list-http-lb-configs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-http-lb-configs.adoc
rename to docs/reference-manual/src/main/jbake/content/list-http-lb-configs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-http-lbs.adoc b/docs/reference-manual/src/main/jbake/content/list-http-lbs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-http-lbs.adoc
rename to docs/reference-manual/src/main/jbake/content/list-http-lbs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-http-listeners.adoc b/docs/reference-manual/src/main/jbake/content/list-http-listeners.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-http-listeners.adoc
rename to docs/reference-manual/src/main/jbake/content/list-http-listeners.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-iiop-listeners.adoc b/docs/reference-manual/src/main/jbake/content/list-iiop-listeners.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-iiop-listeners.adoc
rename to docs/reference-manual/src/main/jbake/content/list-iiop-listeners.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-instances.adoc b/docs/reference-manual/src/main/jbake/content/list-instances.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-instances.adoc
rename to docs/reference-manual/src/main/jbake/content/list-instances.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jacc-providers.adoc b/docs/reference-manual/src/main/jbake/content/list-jacc-providers.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jacc-providers.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jacc-providers.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-javamail-resources.adoc b/docs/reference-manual/src/main/jbake/content/list-javamail-resources.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-javamail-resources.adoc
rename to docs/reference-manual/src/main/jbake/content/list-javamail-resources.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jdbc-connection-pools.adoc b/docs/reference-manual/src/main/jbake/content/list-jdbc-connection-pools.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jdbc-connection-pools.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jdbc-connection-pools.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jdbc-resources.adoc b/docs/reference-manual/src/main/jbake/content/list-jdbc-resources.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jdbc-resources.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jdbc-resources.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jms-hosts.adoc b/docs/reference-manual/src/main/jbake/content/list-jms-hosts.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jms-hosts.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jms-hosts.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jms-resources.adoc b/docs/reference-manual/src/main/jbake/content/list-jms-resources.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jms-resources.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jms-resources.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jmsdest.adoc b/docs/reference-manual/src/main/jbake/content/list-jmsdest.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jmsdest.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jmsdest.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jndi-entries.adoc b/docs/reference-manual/src/main/jbake/content/list-jndi-entries.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jndi-entries.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jndi-entries.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jndi-resources.adoc b/docs/reference-manual/src/main/jbake/content/list-jndi-resources.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jndi-resources.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jndi-resources.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jobs.adoc b/docs/reference-manual/src/main/jbake/content/list-jobs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jobs.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jobs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-jvm-options.adoc b/docs/reference-manual/src/main/jbake/content/list-jvm-options.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-jvm-options.adoc
rename to docs/reference-manual/src/main/jbake/content/list-jvm-options.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-libraries.adoc b/docs/reference-manual/src/main/jbake/content/list-libraries.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-libraries.adoc
rename to docs/reference-manual/src/main/jbake/content/list-libraries.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-lifecycle-modules.adoc b/docs/reference-manual/src/main/jbake/content/list-lifecycle-modules.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-lifecycle-modules.adoc
rename to docs/reference-manual/src/main/jbake/content/list-lifecycle-modules.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-log-attributes.adoc b/docs/reference-manual/src/main/jbake/content/list-log-attributes.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-log-attributes.adoc
rename to docs/reference-manual/src/main/jbake/content/list-log-attributes.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-log-levels.adoc b/docs/reference-manual/src/main/jbake/content/list-log-levels.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-log-levels.adoc
rename to docs/reference-manual/src/main/jbake/content/list-log-levels.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-loggers.adoc b/docs/reference-manual/src/main/jbake/content/list-loggers.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-loggers.adoc
rename to docs/reference-manual/src/main/jbake/content/list-loggers.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-managed-executor-services.adoc b/docs/reference-manual/src/main/jbake/content/list-managed-executor-services.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-managed-executor-services.adoc
rename to docs/reference-manual/src/main/jbake/content/list-managed-executor-services.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-managed-scheduled-executor-services.adoc b/docs/reference-manual/src/main/jbake/content/list-managed-scheduled-executor-services.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-managed-scheduled-executor-services.adoc
rename to docs/reference-manual/src/main/jbake/content/list-managed-scheduled-executor-services.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-managed-thread-factories.adoc b/docs/reference-manual/src/main/jbake/content/list-managed-thread-factories.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-managed-thread-factories.adoc
rename to docs/reference-manual/src/main/jbake/content/list-managed-thread-factories.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-message-security-providers.adoc b/docs/reference-manual/src/main/jbake/content/list-message-security-providers.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-message-security-providers.adoc
rename to docs/reference-manual/src/main/jbake/content/list-message-security-providers.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-modules.adoc b/docs/reference-manual/src/main/jbake/content/list-modules.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-modules.adoc
rename to docs/reference-manual/src/main/jbake/content/list-modules.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-network-listeners.adoc b/docs/reference-manual/src/main/jbake/content/list-network-listeners.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-network-listeners.adoc
rename to docs/reference-manual/src/main/jbake/content/list-network-listeners.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-nodes-config.adoc b/docs/reference-manual/src/main/jbake/content/list-nodes-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-nodes-config.adoc
rename to docs/reference-manual/src/main/jbake/content/list-nodes-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-nodes-dcom.adoc b/docs/reference-manual/src/main/jbake/content/list-nodes-dcom.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-nodes-dcom.adoc
rename to docs/reference-manual/src/main/jbake/content/list-nodes-dcom.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-nodes-ssh.adoc b/docs/reference-manual/src/main/jbake/content/list-nodes-ssh.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-nodes-ssh.adoc
rename to docs/reference-manual/src/main/jbake/content/list-nodes-ssh.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-nodes.adoc b/docs/reference-manual/src/main/jbake/content/list-nodes.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-nodes.adoc
rename to docs/reference-manual/src/main/jbake/content/list-nodes.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-password-aliases.adoc b/docs/reference-manual/src/main/jbake/content/list-password-aliases.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-password-aliases.adoc
rename to docs/reference-manual/src/main/jbake/content/list-password-aliases.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-persistence-types.adoc b/docs/reference-manual/src/main/jbake/content/list-persistence-types.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-persistence-types.adoc
rename to docs/reference-manual/src/main/jbake/content/list-persistence-types.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-protocol-filters.adoc b/docs/reference-manual/src/main/jbake/content/list-protocol-filters.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-protocol-filters.adoc
rename to docs/reference-manual/src/main/jbake/content/list-protocol-filters.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-protocol-finders.adoc b/docs/reference-manual/src/main/jbake/content/list-protocol-finders.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-protocol-finders.adoc
rename to docs/reference-manual/src/main/jbake/content/list-protocol-finders.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-protocols.adoc b/docs/reference-manual/src/main/jbake/content/list-protocols.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-protocols.adoc
rename to docs/reference-manual/src/main/jbake/content/list-protocols.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc b/docs/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc
rename to docs/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-resource-refs.adoc b/docs/reference-manual/src/main/jbake/content/list-resource-refs.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-resource-refs.adoc
rename to docs/reference-manual/src/main/jbake/content/list-resource-refs.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-secure-admin-internal-users.adoc b/docs/reference-manual/src/main/jbake/content/list-secure-admin-internal-users.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-secure-admin-internal-users.adoc
rename to docs/reference-manual/src/main/jbake/content/list-secure-admin-internal-users.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-secure-admin-principals.adoc b/docs/reference-manual/src/main/jbake/content/list-secure-admin-principals.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-secure-admin-principals.adoc
rename to docs/reference-manual/src/main/jbake/content/list-secure-admin-principals.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-sub-components.adoc b/docs/reference-manual/src/main/jbake/content/list-sub-components.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-sub-components.adoc
rename to docs/reference-manual/src/main/jbake/content/list-sub-components.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-supported-cipher-suites.adoc b/docs/reference-manual/src/main/jbake/content/list-supported-cipher-suites.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-supported-cipher-suites.adoc
rename to docs/reference-manual/src/main/jbake/content/list-supported-cipher-suites.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-system-properties.adoc b/docs/reference-manual/src/main/jbake/content/list-system-properties.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-system-properties.adoc
rename to docs/reference-manual/src/main/jbake/content/list-system-properties.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-threadpools.adoc b/docs/reference-manual/src/main/jbake/content/list-threadpools.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-threadpools.adoc
rename to docs/reference-manual/src/main/jbake/content/list-threadpools.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-timers.adoc b/docs/reference-manual/src/main/jbake/content/list-timers.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-timers.adoc
rename to docs/reference-manual/src/main/jbake/content/list-timers.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-transports.adoc b/docs/reference-manual/src/main/jbake/content/list-transports.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-transports.adoc
rename to docs/reference-manual/src/main/jbake/content/list-transports.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-virtual-servers.adoc b/docs/reference-manual/src/main/jbake/content/list-virtual-servers.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-virtual-servers.adoc
rename to docs/reference-manual/src/main/jbake/content/list-virtual-servers.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-web-context-param.adoc b/docs/reference-manual/src/main/jbake/content/list-web-context-param.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-web-context-param.adoc
rename to docs/reference-manual/src/main/jbake/content/list-web-context-param.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list-web-env-entry.adoc b/docs/reference-manual/src/main/jbake/content/list-web-env-entry.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list-web-env-entry.adoc
rename to docs/reference-manual/src/main/jbake/content/list-web-env-entry.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/list.adoc b/docs/reference-manual/src/main/jbake/content/list.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/list.adoc
rename to docs/reference-manual/src/main/jbake/content/list.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/logging.adoc b/docs/reference-manual/src/main/jbake/content/logging.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/logging.adoc
rename to docs/reference-manual/src/main/jbake/content/logging.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/login.adoc b/docs/reference-manual/src/main/jbake/content/login.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/login.adoc
rename to docs/reference-manual/src/main/jbake/content/login.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/manvol1.adoc b/docs/reference-manual/src/main/jbake/content/manvol1.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/manvol1.adoc
rename to docs/reference-manual/src/main/jbake/content/manvol1.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/manvol1m.adoc b/docs/reference-manual/src/main/jbake/content/manvol1m.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/manvol1m.adoc
rename to docs/reference-manual/src/main/jbake/content/manvol1m.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/manvol5asc.adoc b/docs/reference-manual/src/main/jbake/content/manvol5asc.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/manvol5asc.adoc
rename to docs/reference-manual/src/main/jbake/content/manvol5asc.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/migrate-timers.adoc b/docs/reference-manual/src/main/jbake/content/migrate-timers.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/migrate-timers.adoc
rename to docs/reference-manual/src/main/jbake/content/migrate-timers.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/monitor.adoc b/docs/reference-manual/src/main/jbake/content/monitor.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/monitor.adoc
rename to docs/reference-manual/src/main/jbake/content/monitor.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/monitoring.adoc b/docs/reference-manual/src/main/jbake/content/monitoring.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/monitoring.adoc
rename to docs/reference-manual/src/main/jbake/content/monitoring.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/multimode.adoc b/docs/reference-manual/src/main/jbake/content/multimode.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/multimode.adoc
rename to docs/reference-manual/src/main/jbake/content/multimode.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/osgi-shell.adoc b/docs/reference-manual/src/main/jbake/content/osgi-shell.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/osgi-shell.adoc
rename to docs/reference-manual/src/main/jbake/content/osgi-shell.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/osgi.adoc b/docs/reference-manual/src/main/jbake/content/osgi.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/osgi.adoc
rename to docs/reference-manual/src/main/jbake/content/osgi.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/package-appclient.adoc b/docs/reference-manual/src/main/jbake/content/package-appclient.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/package-appclient.adoc
rename to docs/reference-manual/src/main/jbake/content/package-appclient.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/passwords.adoc b/docs/reference-manual/src/main/jbake/content/passwords.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/passwords.adoc
rename to docs/reference-manual/src/main/jbake/content/passwords.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/ping-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/ping-connection-pool.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/ping-connection-pool.adoc
rename to docs/reference-manual/src/main/jbake/content/ping-connection-pool.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/ping-node-dcom.adoc b/docs/reference-manual/src/main/jbake/content/ping-node-dcom.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/ping-node-dcom.adoc
rename to docs/reference-manual/src/main/jbake/content/ping-node-dcom.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/ping-node-ssh.adoc b/docs/reference-manual/src/main/jbake/content/ping-node-ssh.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/ping-node-ssh.adoc
rename to docs/reference-manual/src/main/jbake/content/ping-node-ssh.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/preface.adoc b/docs/reference-manual/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/preface.adoc
rename to docs/reference-manual/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/recover-transactions.adoc b/docs/reference-manual/src/main/jbake/content/recover-transactions.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/recover-transactions.adoc
rename to docs/reference-manual/src/main/jbake/content/recover-transactions.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/redeploy.adoc b/docs/reference-manual/src/main/jbake/content/redeploy.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/redeploy.adoc
rename to docs/reference-manual/src/main/jbake/content/redeploy.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/remove-library.adoc b/docs/reference-manual/src/main/jbake/content/remove-library.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/remove-library.adoc
rename to docs/reference-manual/src/main/jbake/content/remove-library.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/resource.adoc b/docs/reference-manual/src/main/jbake/content/resource.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/resource.adoc
rename to docs/reference-manual/src/main/jbake/content/resource.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/restart-domain.adoc b/docs/reference-manual/src/main/jbake/content/restart-domain.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/restart-domain.adoc
rename to docs/reference-manual/src/main/jbake/content/restart-domain.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/restart-instance.adoc b/docs/reference-manual/src/main/jbake/content/restart-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/restart-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/restart-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/restart-local-instance.adoc b/docs/reference-manual/src/main/jbake/content/restart-local-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/restart-local-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/restart-local-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/restore-domain.adoc b/docs/reference-manual/src/main/jbake/content/restore-domain.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/restore-domain.adoc
rename to docs/reference-manual/src/main/jbake/content/restore-domain.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/rollback-transaction.adoc b/docs/reference-manual/src/main/jbake/content/rollback-transaction.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/rollback-transaction.adoc
rename to docs/reference-manual/src/main/jbake/content/rollback-transaction.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/rotate-log.adoc b/docs/reference-manual/src/main/jbake/content/rotate-log.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/rotate-log.adoc
rename to docs/reference-manual/src/main/jbake/content/rotate-log.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/security.adoc b/docs/reference-manual/src/main/jbake/content/security.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/security.adoc
rename to docs/reference-manual/src/main/jbake/content/security.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/set-batch-runtime-configuration.adoc b/docs/reference-manual/src/main/jbake/content/set-batch-runtime-configuration.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/set-batch-runtime-configuration.adoc
rename to docs/reference-manual/src/main/jbake/content/set-batch-runtime-configuration.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/set-log-attributes.adoc b/docs/reference-manual/src/main/jbake/content/set-log-attributes.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/set-log-attributes.adoc
rename to docs/reference-manual/src/main/jbake/content/set-log-attributes.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/set-log-file-format.adoc b/docs/reference-manual/src/main/jbake/content/set-log-file-format.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/set-log-file-format.adoc
rename to docs/reference-manual/src/main/jbake/content/set-log-file-format.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/set-log-levels.adoc b/docs/reference-manual/src/main/jbake/content/set-log-levels.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/set-log-levels.adoc
rename to docs/reference-manual/src/main/jbake/content/set-log-levels.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/set-web-context-param.adoc b/docs/reference-manual/src/main/jbake/content/set-web-context-param.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/set-web-context-param.adoc
rename to docs/reference-manual/src/main/jbake/content/set-web-context-param.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/set-web-env-entry.adoc b/docs/reference-manual/src/main/jbake/content/set-web-env-entry.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/set-web-env-entry.adoc
rename to docs/reference-manual/src/main/jbake/content/set-web-env-entry.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/set.adoc b/docs/reference-manual/src/main/jbake/content/set.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/set.adoc
rename to docs/reference-manual/src/main/jbake/content/set.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/setup-local-dcom.adoc b/docs/reference-manual/src/main/jbake/content/setup-local-dcom.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/setup-local-dcom.adoc
rename to docs/reference-manual/src/main/jbake/content/setup-local-dcom.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/setup-ssh.adoc b/docs/reference-manual/src/main/jbake/content/setup-ssh.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/setup-ssh.adoc
rename to docs/reference-manual/src/main/jbake/content/setup-ssh.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/show-component-status.adoc b/docs/reference-manual/src/main/jbake/content/show-component-status.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/show-component-status.adoc
rename to docs/reference-manual/src/main/jbake/content/show-component-status.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/start-cluster.adoc b/docs/reference-manual/src/main/jbake/content/start-cluster.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/start-cluster.adoc
rename to docs/reference-manual/src/main/jbake/content/start-cluster.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/start-database.adoc b/docs/reference-manual/src/main/jbake/content/start-database.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/start-database.adoc
rename to docs/reference-manual/src/main/jbake/content/start-database.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/start-domain.adoc b/docs/reference-manual/src/main/jbake/content/start-domain.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/start-domain.adoc
rename to docs/reference-manual/src/main/jbake/content/start-domain.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/start-instance.adoc b/docs/reference-manual/src/main/jbake/content/start-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/start-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/start-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/start-local-instance.adoc b/docs/reference-manual/src/main/jbake/content/start-local-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/start-local-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/start-local-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/stop-cluster.adoc b/docs/reference-manual/src/main/jbake/content/stop-cluster.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/stop-cluster.adoc
rename to docs/reference-manual/src/main/jbake/content/stop-cluster.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/stop-database.adoc b/docs/reference-manual/src/main/jbake/content/stop-database.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/stop-database.adoc
rename to docs/reference-manual/src/main/jbake/content/stop-database.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/stop-domain.adoc b/docs/reference-manual/src/main/jbake/content/stop-domain.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/stop-domain.adoc
rename to docs/reference-manual/src/main/jbake/content/stop-domain.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/stop-instance.adoc b/docs/reference-manual/src/main/jbake/content/stop-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/stop-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/stop-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/stop-local-instance.adoc b/docs/reference-manual/src/main/jbake/content/stop-local-instance.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/stop-local-instance.adoc
rename to docs/reference-manual/src/main/jbake/content/stop-local-instance.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/title.adoc b/docs/reference-manual/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/title.adoc
rename to docs/reference-manual/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/toc.adoc b/docs/reference-manual/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/toc.adoc
rename to docs/reference-manual/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/undeploy.adoc b/docs/reference-manual/src/main/jbake/content/undeploy.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/undeploy.adoc
rename to docs/reference-manual/src/main/jbake/content/undeploy.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc b/docs/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc
rename to docs/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/uninstall-node-dcom.adoc b/docs/reference-manual/src/main/jbake/content/uninstall-node-dcom.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/uninstall-node-dcom.adoc
rename to docs/reference-manual/src/main/jbake/content/uninstall-node-dcom.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/uninstall-node-ssh.adoc b/docs/reference-manual/src/main/jbake/content/uninstall-node-ssh.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/uninstall-node-ssh.adoc
rename to docs/reference-manual/src/main/jbake/content/uninstall-node-ssh.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/uninstall-node.adoc b/docs/reference-manual/src/main/jbake/content/uninstall-node.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/uninstall-node.adoc
rename to docs/reference-manual/src/main/jbake/content/uninstall-node.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/unset-web-context-param.adoc b/docs/reference-manual/src/main/jbake/content/unset-web-context-param.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/unset-web-context-param.adoc
rename to docs/reference-manual/src/main/jbake/content/unset-web-context-param.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc b/docs/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc
rename to docs/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/unset.adoc b/docs/reference-manual/src/main/jbake/content/unset.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/unset.adoc
rename to docs/reference-manual/src/main/jbake/content/unset.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/update-connector-security-map.adoc b/docs/reference-manual/src/main/jbake/content/update-connector-security-map.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/update-connector-security-map.adoc
rename to docs/reference-manual/src/main/jbake/content/update-connector-security-map.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc b/docs/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc
rename to docs/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/update-file-user.adoc b/docs/reference-manual/src/main/jbake/content/update-file-user.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/update-file-user.adoc
rename to docs/reference-manual/src/main/jbake/content/update-file-user.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/update-node-config.adoc b/docs/reference-manual/src/main/jbake/content/update-node-config.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/update-node-config.adoc
rename to docs/reference-manual/src/main/jbake/content/update-node-config.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/update-node-ssh.adoc b/docs/reference-manual/src/main/jbake/content/update-node-ssh.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/update-node-ssh.adoc
rename to docs/reference-manual/src/main/jbake/content/update-node-ssh.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/update-node-ssh001.adoc b/docs/reference-manual/src/main/jbake/content/update-node-ssh001.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/update-node-ssh001.adoc
rename to docs/reference-manual/src/main/jbake/content/update-node-ssh001.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/update-password-alias.adoc b/docs/reference-manual/src/main/jbake/content/update-password-alias.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/update-password-alias.adoc
rename to docs/reference-manual/src/main/jbake/content/update-password-alias.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/uptime.adoc b/docs/reference-manual/src/main/jbake/content/uptime.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/uptime.adoc
rename to docs/reference-manual/src/main/jbake/content/uptime.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/validate-dcom.adoc b/docs/reference-manual/src/main/jbake/content/validate-dcom.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/validate-dcom.adoc
rename to docs/reference-manual/src/main/jbake/content/validate-dcom.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/validate-multicast.adoc b/docs/reference-manual/src/main/jbake/content/validate-multicast.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/validate-multicast.adoc
rename to docs/reference-manual/src/main/jbake/content/validate-multicast.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/verify-domain-xml.adoc b/docs/reference-manual/src/main/jbake/content/verify-domain-xml.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/verify-domain-xml.adoc
rename to docs/reference-manual/src/main/jbake/content/verify-domain-xml.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/content/version.adoc b/docs/reference-manual/src/main/jbake/content/version.adoc
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/content/version.adoc
rename to docs/reference-manual/src/main/jbake/content/version.adoc
diff --git a/docs/glassfish/reference-manual/src/main/jbake/jbake.properties b/docs/reference-manual/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/jbake.properties
rename to docs/reference-manual/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/reference-manual/src/main/jbake/templates/footer.ftl b/docs/reference-manual/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/templates/footer.ftl
rename to docs/reference-manual/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/reference-manual/src/main/jbake/templates/header.ftl b/docs/reference-manual/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/templates/header.ftl
rename to docs/reference-manual/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/reference-manual/src/main/jbake/templates/menu.ftl b/docs/reference-manual/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/templates/menu.ftl
rename to docs/reference-manual/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/reference-manual/src/main/jbake/templates/page.ftl b/docs/reference-manual/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/reference-manual/src/main/jbake/templates/page.ftl
rename to docs/reference-manual/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/release-notes/README.md b/docs/release-notes/README.md
similarity index 100%
rename from docs/glassfish/release-notes/README.md
rename to docs/release-notes/README.md
diff --git a/docs/glassfish/release-notes/pom.xml b/docs/release-notes/pom.xml
similarity index 100%
rename from docs/glassfish/release-notes/pom.xml
rename to docs/release-notes/pom.xml
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/css/style.css b/docs/release-notes/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/assets/css/style.css
rename to docs/release-notes/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/release-notes/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/release-notes/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/release-notes/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/release-notes/src/main/jbake/content/preface.adoc b/docs/release-notes/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/content/preface.adoc
rename to docs/release-notes/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/release-notes/src/main/jbake/content/release-notes.adoc b/docs/release-notes/src/main/jbake/content/release-notes.adoc
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/content/release-notes.adoc
rename to docs/release-notes/src/main/jbake/content/release-notes.adoc
diff --git a/docs/glassfish/release-notes/src/main/jbake/content/title.adoc b/docs/release-notes/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/content/title.adoc
rename to docs/release-notes/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/release-notes/src/main/jbake/content/toc.adoc b/docs/release-notes/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/content/toc.adoc
rename to docs/release-notes/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/release-notes/src/main/jbake/jbake.properties b/docs/release-notes/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/jbake.properties
rename to docs/release-notes/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/release-notes/src/main/jbake/templates/footer.ftl b/docs/release-notes/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/templates/footer.ftl
rename to docs/release-notes/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/release-notes/src/main/jbake/templates/header.ftl b/docs/release-notes/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/templates/header.ftl
rename to docs/release-notes/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/release-notes/src/main/jbake/templates/menu.ftl b/docs/release-notes/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/templates/menu.ftl
rename to docs/release-notes/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/release-notes/src/main/jbake/templates/page.ftl b/docs/release-notes/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/release-notes/src/main/jbake/templates/page.ftl
rename to docs/release-notes/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/security-guide/README.md b/docs/security-guide/README.md
similarity index 100%
rename from docs/glassfish/security-guide/README.md
rename to docs/security-guide/README.md
diff --git a/docs/glassfish/security-guide/pom.xml b/docs/security-guide/pom.xml
similarity index 100%
rename from docs/glassfish/security-guide/pom.xml
rename to docs/security-guide/pom.xml
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/css/style.css b/docs/security-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/assets/css/style.css
rename to docs/security-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/img/accept-certif.png b/docs/security-guide/src/main/jbake/assets/img/accept-certif.png
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/assets/img/accept-certif.png
rename to docs/security-guide/src/main/jbake/assets/img/accept-certif.png
Binary files differ
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/security-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/security-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/img/jacc-providers.png b/docs/security-guide/src/main/jbake/assets/img/jacc-providers.png
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/assets/img/jacc-providers.png
rename to docs/security-guide/src/main/jbake/assets/img/jacc-providers.png
Binary files differ
diff --git a/docs/glassfish/security-guide/src/main/jbake/assets/img/securityrolemapping.png b/docs/security-guide/src/main/jbake/assets/img/securityrolemapping.png
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/assets/img/securityrolemapping.png
rename to docs/security-guide/src/main/jbake/assets/img/securityrolemapping.png
Binary files differ
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/administrative-security.adoc b/docs/security-guide/src/main/jbake/content/administrative-security.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/administrative-security.adoc
rename to docs/security-guide/src/main/jbake/content/administrative-security.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/loe.adoc b/docs/security-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/loe.adoc
rename to docs/security-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/lof.adoc b/docs/security-guide/src/main/jbake/content/lof.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/lof.adoc
rename to docs/security-guide/src/main/jbake/content/lof.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/lot.adoc b/docs/security-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/lot.adoc
rename to docs/security-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/message-security.adoc b/docs/security-guide/src/main/jbake/content/message-security.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/message-security.adoc
rename to docs/security-guide/src/main/jbake/content/message-security.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/preface.adoc b/docs/security-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/preface.adoc
rename to docs/security-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/running-in-secure-environment.adoc b/docs/security-guide/src/main/jbake/content/running-in-secure-environment.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/running-in-secure-environment.adoc
rename to docs/security-guide/src/main/jbake/content/running-in-secure-environment.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/security-in-cluster-mode.adoc b/docs/security-guide/src/main/jbake/content/security-in-cluster-mode.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/security-in-cluster-mode.adoc
rename to docs/security-guide/src/main/jbake/content/security-in-cluster-mode.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/system-security.adoc b/docs/security-guide/src/main/jbake/content/system-security.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/system-security.adoc
rename to docs/security-guide/src/main/jbake/content/system-security.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/title.adoc b/docs/security-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/title.adoc
rename to docs/security-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/toc.adoc b/docs/security-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/toc.adoc
rename to docs/security-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/content/user-security.adoc b/docs/security-guide/src/main/jbake/content/user-security.adoc
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/content/user-security.adoc
rename to docs/security-guide/src/main/jbake/content/user-security.adoc
diff --git a/docs/glassfish/security-guide/src/main/jbake/jbake.properties b/docs/security-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/jbake.properties
rename to docs/security-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/security-guide/src/main/jbake/templates/footer.ftl b/docs/security-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/templates/footer.ftl
rename to docs/security-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/security-guide/src/main/jbake/templates/header.ftl b/docs/security-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/templates/header.ftl
rename to docs/security-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/security-guide/src/main/jbake/templates/menu.ftl b/docs/security-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/templates/menu.ftl
rename to docs/security-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/security-guide/src/main/jbake/templates/page.ftl b/docs/security-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/security-guide/src/main/jbake/templates/page.ftl
rename to docs/security-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/troubleshooting-guide/README.md b/docs/troubleshooting-guide/README.md
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/README.md
rename to docs/troubleshooting-guide/README.md
diff --git a/docs/glassfish/troubleshooting-guide/pom.xml b/docs/troubleshooting-guide/pom.xml
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/pom.xml
rename to docs/troubleshooting-guide/pom.xml
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/css/style.css b/docs/troubleshooting-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/assets/css/style.css
rename to docs/troubleshooting-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/troubleshooting-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/troubleshooting-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/content/faqs.adoc b/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/content/faqs.adoc
rename to docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/content/overview.adoc b/docs/troubleshooting-guide/src/main/jbake/content/overview.adoc
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/content/overview.adoc
rename to docs/troubleshooting-guide/src/main/jbake/content/overview.adoc
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/content/preface.adoc b/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/content/preface.adoc
rename to docs/troubleshooting-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc b/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
rename to docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/content/title.adoc b/docs/troubleshooting-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/content/title.adoc
rename to docs/troubleshooting-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/content/toc.adoc b/docs/troubleshooting-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/content/toc.adoc
rename to docs/troubleshooting-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/jbake.properties b/docs/troubleshooting-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/jbake.properties
rename to docs/troubleshooting-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/templates/footer.ftl b/docs/troubleshooting-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/templates/footer.ftl
rename to docs/troubleshooting-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/templates/header.ftl b/docs/troubleshooting-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/templates/header.ftl
rename to docs/troubleshooting-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/templates/menu.ftl b/docs/troubleshooting-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/templates/menu.ftl
rename to docs/troubleshooting-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/troubleshooting-guide/src/main/jbake/templates/page.ftl b/docs/troubleshooting-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/troubleshooting-guide/src/main/jbake/templates/page.ftl
rename to docs/troubleshooting-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/upgrade-guide/README.md b/docs/upgrade-guide/README.md
similarity index 100%
rename from docs/glassfish/upgrade-guide/README.md
rename to docs/upgrade-guide/README.md
diff --git a/docs/glassfish/upgrade-guide/pom.xml b/docs/upgrade-guide/pom.xml
similarity index 100%
rename from docs/glassfish/upgrade-guide/pom.xml
rename to docs/upgrade-guide/pom.xml
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/css/style.css b/docs/upgrade-guide/src/main/jbake/assets/css/style.css
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/assets/css/style.css
rename to docs/upgrade-guide/src/main/jbake/assets/css/style.css
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/docs/upgrade-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
rename to docs/upgrade-guide/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/content/loe.adoc b/docs/upgrade-guide/src/main/jbake/content/loe.adoc
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/content/loe.adoc
rename to docs/upgrade-guide/src/main/jbake/content/loe.adoc
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/content/lot.adoc b/docs/upgrade-guide/src/main/jbake/content/lot.adoc
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/content/lot.adoc
rename to docs/upgrade-guide/src/main/jbake/content/lot.adoc
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/content/preface.adoc b/docs/upgrade-guide/src/main/jbake/content/preface.adoc
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/content/preface.adoc
rename to docs/upgrade-guide/src/main/jbake/content/preface.adoc
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/content/title.adoc b/docs/upgrade-guide/src/main/jbake/content/title.adoc
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/content/title.adoc
rename to docs/upgrade-guide/src/main/jbake/content/title.adoc
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/content/toc.adoc b/docs/upgrade-guide/src/main/jbake/content/toc.adoc
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/content/toc.adoc
rename to docs/upgrade-guide/src/main/jbake/content/toc.adoc
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc b/docs/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc
rename to docs/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc b/docs/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc
rename to docs/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/jbake.properties b/docs/upgrade-guide/src/main/jbake/jbake.properties
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/jbake.properties
rename to docs/upgrade-guide/src/main/jbake/jbake.properties
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/templates/footer.ftl b/docs/upgrade-guide/src/main/jbake/templates/footer.ftl
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/templates/footer.ftl
rename to docs/upgrade-guide/src/main/jbake/templates/footer.ftl
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/templates/header.ftl b/docs/upgrade-guide/src/main/jbake/templates/header.ftl
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/templates/header.ftl
rename to docs/upgrade-guide/src/main/jbake/templates/header.ftl
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/templates/menu.ftl b/docs/upgrade-guide/src/main/jbake/templates/menu.ftl
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/templates/menu.ftl
rename to docs/upgrade-guide/src/main/jbake/templates/menu.ftl
diff --git a/docs/glassfish/upgrade-guide/src/main/jbake/templates/page.ftl b/docs/upgrade-guide/src/main/jbake/templates/page.ftl
similarity index 100%
rename from docs/glassfish/upgrade-guide/src/main/jbake/templates/page.ftl
rename to docs/upgrade-guide/src/main/jbake/templates/page.ftl
diff --git a/docs/glassfish/website/pom.xml b/docs/website/pom.xml
similarity index 100%
rename from docs/glassfish/website/pom.xml
rename to docs/website/pom.xml
diff --git a/docs/glassfish/website/src/main/resources/CONTRIBUTING.md b/docs/website/src/main/resources/CONTRIBUTING.md
similarity index 100%
rename from docs/glassfish/website/src/main/resources/CONTRIBUTING.md
rename to docs/website/src/main/resources/CONTRIBUTING.md
diff --git a/docs/glassfish/website/src/main/resources/LICENSE.md b/docs/website/src/main/resources/LICENSE.md
similarity index 100%
rename from docs/glassfish/website/src/main/resources/LICENSE.md
rename to docs/website/src/main/resources/LICENSE.md
diff --git a/docs/glassfish/website/src/main/resources/README.md b/docs/website/src/main/resources/README.md
similarity index 100%
rename from docs/glassfish/website/src/main/resources/README.md
rename to docs/website/src/main/resources/README.md
diff --git a/docs/glassfish/website/src/main/resources/_config.yml b/docs/website/src/main/resources/_config.yml
similarity index 100%
rename from docs/glassfish/website/src/main/resources/_config.yml
rename to docs/website/src/main/resources/_config.yml
diff --git a/docs/glassfish/website/src/main/resources/docs/README.md b/docs/website/src/main/resources/docs/README.md
similarity index 100%
rename from docs/glassfish/website/src/main/resources/docs/README.md
rename to docs/website/src/main/resources/docs/README.md
diff --git a/docs/glassfish/website/src/main/resources/documentation.md b/docs/website/src/main/resources/documentation.md
similarity index 100%
rename from docs/glassfish/website/src/main/resources/documentation.md
rename to docs/website/src/main/resources/documentation.md
diff --git a/docs/glassfish/website/src/main/resources/download.md b/docs/website/src/main/resources/download.md
similarity index 100%
rename from docs/glassfish/website/src/main/resources/download.md
rename to docs/website/src/main/resources/download.md
diff --git a/docs/glassfish/website/src/main/resources/img/eclipse_foundation_logo_tiny.png b/docs/website/src/main/resources/img/eclipse_foundation_logo_tiny.png
similarity index 100%
rename from docs/glassfish/website/src/main/resources/img/eclipse_foundation_logo_tiny.png
rename to docs/website/src/main/resources/img/eclipse_foundation_logo_tiny.png
Binary files differ
diff --git a/docs/glassfish/website/src/main/resources/pr_workflow.md b/docs/website/src/main/resources/pr_workflow.md
similarity index 100%
rename from docs/glassfish/website/src/main/resources/pr_workflow.md
rename to docs/website/src/main/resources/pr_workflow.md