You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2021/07/20 00:13:34 UTC
[felix-antora-site] 04/06: remove unneeded 'documentation' URI segment

This is an automated email from the ASF dual-hosted git repository.

djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/felix-antora-site.git

commit 3782de8305fd32546630453cf1036617d4aa9986
Author: David Jencks <dj...@apache.org>
AuthorDate: Mon Jul 19 14:45:54 2021 -0700

    remove unneeded 'documentation' URI segment
---
 modules/ROOT/nav.adoc                              | 352 +++++++--------------
 modules/ROOT/pages/auto-index.adoc                 |  52 +--
 .../ROOT/pages/{documentation => }/community.adoc  |   0
 .../community/contributing.adoc                    |   6 +-
 .../community/project-info.adoc                    |   0
 .../community/projects-using-felix.adoc            |   0
 .../pages/{documentation => }/development.adoc     |   0
 .../development/coding-standards.adoc              |   0
 .../development/dependencies-file-template.adoc    |   0
 .../development/provisional-osgi-api-policy.adoc   |   0
 .../development/release-management-nexus.adoc      |   2 +-
 .../development/site-how-to.adoc                   |   0
 .../using-the-osgi-compliance-tests.adoc           |   0
 modules/ROOT/pages/documentation.adoc              |  16 +-
 modules/ROOT/pages/documentation/faqs.adoc         |   6 -
 .../apache-felix-dependency-manager.adoc           |  64 ----
 .../extending-the-apache-felix-web-console.adoc    |  10 -
 .../apache-felix-osgi-tutorial.adoc                |  16 -
 modules/ROOT/pages/faqs.adoc                       |   6 +
 .../faqs/apache-felix-bundle-plugin-faq.adoc       |   0
 .../faqs/apache-felix-scr-plugin-faq.adoc          |   2 +-
 .../pages/{documentation => }/getting-started.adoc |   6 +-
 modules/ROOT/pages/index.adoc                      |   4 +-
 .../pages/{documentation => }/subprojects.adoc     |  36 +--
 .../apache-felix-dependency-manager.adoc           |  64 ++++
 .../guides/annotations.adoc                        |   0
 .../guides/background.adoc                         |   0
 .../guides/bundles-and-dependencies.adoc           |   0
 .../guides/design-patterns.adoc                    |   0
 .../guides/development.adoc                        |   0
 .../guides/dm-lambda.adoc                          |   0
 .../guides/history.adoc                            |   0
 .../guides/javadocs.adoc                           |   0
 .../guides/migrating-from-earlier-versions.adoc    |   0
 .../guides/migrating-from-other-solutions.adoc     |   0
 .../guides/performance-tuning.adoc                 |   0
 .../guides/resources.adoc                          |   0
 .../guides/whatsnew-r15.adoc                       |   2 +-
 .../guides/whatsnew.adoc                           |   2 +-
 .../reference/component-adapter.adoc               |   2 +-
 .../reference/component-aspect.adoc                |   0
 .../reference/component-bundle-adapter.adoc        |   0
 .../component-factory-configuration-adapter.adoc   |   0
 .../reference/component-resource-adapter.adoc      |   0
 .../reference/component-singleton.adoc             |   0
 .../reference/components.adoc                      |  12 +-
 .../reference/dependencies.adoc                    |   8 +-
 .../reference/dependency-bundle.adoc               |   0
 .../reference/dependency-configuration.adoc        |   0
 .../reference/dependency-resource.adoc             |   0
 .../reference/dependency-service.adoc              |   0
 .../reference/diagrams/statediagram.uxf            |   0
 .../reference/dm-annotations.adoc                  |   0
 .../reference/external-links.adoc                  |   0
 .../reference/service-scopes.adoc                  |   0
 .../reference/thread-model.adoc                    |   0
 .../tutorials/dm.hello.tgz                         | Bin
 .../tutorials/getting-started.adoc                 |   0
 .../tutorials/leveraging-the-shell.adoc            |   0
 .../tutorials/sample-code.adoc                     |   0
 .../tutorials/working-with-annotations.adoc        |   0
 .../subprojects/apache-felix-event-admin.adoc      |   0
 .../subprojects/apache-felix-file-install.adoc     |   0
 .../apache-felix-framework-security.adoc           |   0
 .../subprojects/apache-felix-framework.adoc        |   0
 .../apache-felix-framework-bundle-cache.adoc       |   2 +-
 ...e-felix-framework-configuration-properties.adoc |   0
 .../apache-felix-framework-faq.adoc                |   6 +-
 ...he-felix-framework-launching-and-embedding.adoc |   8 +-
 ...apache-felix-framework-usage-documentation.adoc |   4 +-
 .../subprojects/apache-felix-gogo.adoc             |   4 +-
 .../apache-felix-gogo/rfc-147-overview.adoc        |   0
 .../subprojects/apache-felix-healthchecks.adoc     |   0
 .../subprojects/apache-felix-inventory.adoc        |   2 +-
 .../subprojects/apache-felix-log.adoc              |   0
 .../subprojects/apache-felix-logback.adoc          |   0
 .../apache-felix-maven-bundle-plugin-bnd.adoc      |   2 +-
 .../apache-felix-maven-scr-plugin-use.adoc         |   0
 .../apache-felix-scr-ant-task-use.adoc             |   0
 .../apache-felix-scr-bndtools-use.adoc             |   0
 .../extending-scr-annotations.adoc                 |   0
 .../scr-annotations.adoc                           |   0
 .../scr-javadoc-tags.adoc                          |   0
 .../subprojects/apache-felix-metatype-service.adoc |   4 +-
 .../apache-felix-osgi-bundle-repository.adoc       |   2 +-
 .../apache-felix-preferences-service.adoc          |   0
 .../subprojects/apache-felix-remote-shell.adoc     |   2 +-
 .../subprojects/apache-felix-shell-tui.adoc        |   2 +-
 .../subprojects/apache-felix-shell.adoc            |   0
 .../subprojects/apache-felix-web-console.adoc      |   4 +-
 .../extending-the-apache-felix-web-console.adoc    |  10 +
 .../branding-the-web-console.adoc                  |   0
 .../providing-resources.adoc                       |   0
 .../providing-web-console-plugins.adoc             |   0
 .../web-console-logging.adoc                       |   0
 .../web-console-output-templating.adoc             |   0
 .../web-console-restful-api.adoc                   |   0
 .../web-console-security-provider.adoc             |   0
 .../tutorials-examples-and-presentations.adoc      |   0
 .../apache-felix-application-demonstration.adoc    |   0
 .../apache-felix-osgi-faq.adoc                     |   2 +-
 .../apache-felix-osgi-tutorial.adoc                |  16 +
 .../apache-felix-tutorial-example-1.adoc           |   0
 .../apache-felix-tutorial-example-2.adoc           |   0
 .../apache-felix-tutorial-example-2b.adoc          |   0
 .../apache-felix-tutorial-example-3.adoc           |   0
 .../apache-felix-tutorial-example-4.adoc           |   0
 .../apache-felix-tutorial-example-5.adoc           |   0
 .../apache-felix-tutorial-example-6.adoc           |   0
 .../apache-felix-tutorial-example-7.adoc           |   0
 .../apache-felix-tutorial-example-8.adoc           |   0
 .../apache-felix-tutorial-example-9.adoc           |   0
 112 files changed, 298 insertions(+), 440 deletions(-)

diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 993a5f9..e5642fe 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -1,266 +1,148 @@
-* xref:master@documentation:ROOT:auto-index.adoc[]
+* xref:auto-index.adoc[]
 //indexList::[relative=*.adoc]
-* xref:master@documentation:ROOT:license.adoc[]
-* xref:master@documentation:ROOT:documentation.adoc[]
-* xref:master@documentation:ROOT:media.adoc[]
-* xref:master@documentation:ROOT:miscellaneous.adoc[]
-* xref:master@documentation:ROOT:news.adoc[]
-* xref:master@documentation:ROOT:index.adoc[]
-
-* Documentation
-//indexList::[level=2,relative=documentation/*.adoc]
-** xref:master@documentation:ROOT:documentation/subprojects.adoc[]
-** xref:master@documentation:ROOT:documentation/community.adoc[]
-** xref:master@documentation:ROOT:documentation/development.adoc[]
-** xref:master@documentation:ROOT:documentation/faqs.adoc[]
-** xref:master@documentation:ROOT:documentation/getting-started.adoc[]
-** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations.adoc[]
+* xref:license.adoc[]
+* xref:documentation.adoc[]
+* xref:media.adoc[]
+* xref:miscellaneous.adoc[]
+* xref:news.adoc[]
+* xref:index.adoc[]
 
 ** Community
-//indexList::[level=3,relative=documentation/community/*.adoc]
-*** xref:master@documentation:ROOT:documentation/community/project-info.adoc[]
-*** xref:master@documentation:ROOT:documentation/community/contributing.adoc[]
-*** xref:master@documentation:ROOT:documentation/community/projects-using-felix.adoc[]
+//indexList::[level=3,relative=community/*.adoc]
+*** xref:community/project-info.adoc[]
+*** xref:community/contributing.adoc[]
+*** xref:community/projects-using-felix.adoc[]
 
 ** Development
-//indexList::[level=3,relative=documentation/development/*.adoc]
-*** xref:master@documentation:ROOT:documentation/development/coding-standards.adoc[]
-*** xref:master@documentation:ROOT:documentation/development/dependencies-file-template.adoc[]
-*** xref:master@documentation:ROOT:documentation/development/provisional-osgi-api-policy.adoc[]
-*** xref:master@documentation:ROOT:documentation/development/release-management-nexus.adoc[]
-*** xref:master@documentation:ROOT:documentation/development/site-how-to.adoc[]
-*** xref:master@documentation:ROOT:documentation/development/using-the-osgi-compliance-tests.adoc[]
+//indexList::[level=3,relative=development/*.adoc]
+*** xref:development/coding-standards.adoc[]
+*** xref:development/dependencies-file-template.adoc[]
+*** xref:development/provisional-osgi-api-policy.adoc[]
+*** xref:development/release-management-nexus.adoc[]
+*** xref:development/site-how-to.adoc[]
+*** xref:development/using-the-osgi-compliance-tests.adoc[]
 
 ** FAQS
-//indexList::[level=3,relative=documentation/faqs/*.adoc]
-*** xref:master@documentation:ROOT:documentation/faqs/apache-felix-bundle-plugin-faq.adoc[]
-*** xref:master@documentation:ROOT:documentation/faqs/apache-felix-scr-plugin-faq.adoc[]
+//indexList::[level=3,relative=faqs/*.adoc]
+*** xref:faqs/apache-felix-bundle-plugin-faq.adoc[]
+*** xref:faqs/apache-felix-scr-plugin-faq.adoc[]
 
 ** Subprojects
-//indexList::[level=3,relative=documentation/subprojects/*.adoc]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-autoconf.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-commons.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-deployment-admin.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-event-admin.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-file-install.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-framework.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-framework-security.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-gogo.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-healthchecks.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-inventory.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-jaas.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-lightweight-http-service.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-log.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-logback.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-manifest-generator-mangen.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-obr-plugin.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-osgi-plugin.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-scr-plugin.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-metatype-service.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-osgi-bundle-repository.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-osgi-core.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-preferences-service.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-remote-shell.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-script-console-plugin.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-serialization-framework.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-shell.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-shell-tui.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-upnp.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-user-admin.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-web-console.adoc[]
-*** xref:master@documentation:ROOT:documentation/subprojects/mosgi-managed-osgi-framework.adoc[]
-
-*** Commons (retired)
-//indexList::[level=4,relative=documentation/subprojects/apache-felix-commons/*.adoc]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-commons/creating-bundles-using-bnd.adoc[]
+//indexList::[level=3,relative=subprojects/*.adoc]
+*** xref:subprojects/apache-felix-dependency-manager.adoc[]
+*** xref:subprojects/apache-felix-event-admin.adoc[]
+*** xref:subprojects/apache-felix-file-install.adoc[]
+*** xref:subprojects/apache-felix-framework.adoc[]
+*** xref:subprojects/apache-felix-framework-security.adoc[]
+*** xref:subprojects/apache-felix-gogo.adoc[]
+*** xref:subprojects/apache-felix-healthchecks.adoc[]
+*** xref:subprojects/apache-felix-inventory.adoc[]
+*** xref:subprojects/apache-felix-log.adoc[]
+*** xref:subprojects/apache-felix-logback.adoc[]
+*** xref:subprojects/apache-felix-maven-bundle-plugin-bnd.adoc[]
+*** xref:subprojects/apache-felix-metatype-service.adoc[]
+*** xref:subprojects/apache-felix-osgi-bundle-repository.adoc[]
+*** xref:subprojects/apache-felix-preferences-service.adoc[]
+*** xref:subprojects/apache-felix-remote-shell.adoc[]
+*** xref:subprojects/apache-felix-shell.adoc[]
+*** xref:subprojects/apache-felix-shell-tui.adoc[]
+*** xref:subprojects/apache-felix-web-console.adoc[]
 
 *** Dependency Manager
 **** Guides
-//indexList::[level=5,relative=documentation/subprojects/apache-felix-dependency-manager/guides/*.adoc]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/annotations.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/background.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/development.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/history.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/resources.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc[]
+//indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/guides/*.adoc]
+***** xref:subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/annotations.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/background.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/development.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/history.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/javadocs.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/resources.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc[]
 
 **** Reference
-//indexList::[level=5,relative=documentation/subprojects/apache-felix-dependency-manager/reference/*.adoc]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/components.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/external-links.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc[]
+//indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/reference/*.adoc]
+***** xref:subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/components.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/dependencies.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/external-links.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/thread-model.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc[]
 
 **** Tutorials
-//indexList::[level=5,relative=documentation/subprojects/apache-felix-dependency-manager/tutorials/*.adoc]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc[]
+//indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/tutorials/*.adoc]
+***** xref:subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc[]
+***** xref:subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc[]
 
 *** Framework
-//indexList::[level=4,relative=documentation/subprojects/apache-felix-framework/*.adoc]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc[]
+//indexList::[level=4,relative=subprojects/apache-felix-framework/*.adoc]
+**** xref:subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc[]
+**** xref:subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc[]
+**** xref:subprojects/apache-felix-framework/apache-felix-framework-faq.adoc[]
+**** xref:subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc[]
+**** xref:subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc[]
 
 *** GoGo Shell
-//indexList::[level=4,relative=documentation/subprojects/apache-felix-gogo/*.adoc]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-gogo/rfc-147-overview.adoc[]
-
-*** iPOJO (retired)
-//indexList::[level=4,relative=documentation/subprojects/apache-felix-ipojo/**/*.adoc]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/injecting-bundle-context.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-faq.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-feature-overview.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/apache-felix-ipojo-online-manipulator.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/articles-and-presentations.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-eclipse-integration.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/combining-ipojo-and-configuration-admin.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/configuration-handler.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/ipojo-extender-configuration.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-instances.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/developing-camel-mediators-with-ipojo.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/dive-into-the-ipojo-manipulation-depths.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/download.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/event-admin-handlers.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-testing-components.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/how-to-use-ipojo-annotations.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-use-ipojo-manipulation-metadata.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-maven-plug-in.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-devguide/how-to-write-your-own-handler.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/instance-vs-service-controller.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-ipojo-introspection-api.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/architecture-handler.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/ipojo-advanced-tutorial.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-ant-task.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/apache-felix-ipojo-api.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-arch-command.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/ipojo-composition-tutorial.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/how-to-use-ipojo-factories.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/ipojo-hello-word-maven-based-tutorial.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/ipojo-hierarchical-composition-overview.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/ipojo-in-10-minutes.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/ipojo-jmx-handler.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-karaf-feature.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-keypoints.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-successstories.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/ipojo-webconsole-plugin.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/ipojo-news.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/ipojo-reference-card.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/ipojo-support.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-tools/junit4osgi.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-junit4osgi/apache-felix-ipojo-junit4osgi-architecture.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-junit4osgi/apache-felix-ipojo-junit4osgi-tutorial.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/lifecycle-callback-handler.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/controller-lifecycle-handler.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-junit4osgi/apache-felix-ipojo-junit4osgi-methods.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/providing-osgi-services.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/related-works.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/service-requirement-handler.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/service-binding-interceptors.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/using-stereotypes.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedvms.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-supportedosgi.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/extender-pattern-handler.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-junit4osgi.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-junit4osgi/apache-felix-ipojo-junit4osgi-maven.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/temporal-service-dependency.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/describing-components/white-board-pattern-handler.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/constructing-pojo-objects-with-factory-methods.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/apache-felix-ipojo-dosgi.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/ipojo-advanced-topics/ipojo-factory-service.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-userguide/using-xml-schemas.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-why-choose-ipojo.adoc[]
+//indexList::[level=4,relative=subprojects/apache-felix-gogo/*.adoc]
+**** xref:subprojects/apache-felix-gogo/rfc-147-overview.adoc[]
 
 *** Maven SCR plugin
-//indexList::[level=4,relative=documentation/subprojects/apache-felix-maven-scr-plugin/*.adoc]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.adoc[]
-
-*** UPNP (retired)
-//indexList::[level=4,relative=documentation/subprojects/apache-felix-upnp/**/*.adoc]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-upnp/upnp-getting-started.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-upnp/upnp-known-issues.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-upnp/upnp-driver-architecture.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-upnp/upnp-testing-devices.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-upnp/upnp-acknowledgments.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-upnp/upnp-testing-devices/upnp-examples/upnp-writing-cd-and-cp.adoc[]
-
-*** User Admin (retired)
-//indexList::[level=4,relative=documentation/subprojects/apache-felix-user-admin/*.adoc]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-background.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-file-store.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-getting-started.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-introduction.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-user-admin/apache-felix-user-admin-mongodb-store.adoc[]
+//indexList::[level=4,relative=subprojects/apache-felix-maven-scr-plugin/*.adoc]
+**** xref:subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.adoc[]
+**** xref:subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.adoc[]
+**** xref:subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.adoc[]
+**** xref:subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.adoc[]
+**** xref:subprojects/apache-felix-maven-scr-plugin/scr-annotations.adoc[]
+**** xref:subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.adoc[]
 
 *** Web Console
-//indexList::[level=4,relative=documentation/subprojects/apache-felix-web-console/*.adoc]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-web-console/web-console-restful-api.adoc[]
-**** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-web-console/web-console-security-provider.adoc[]
+//indexList::[level=4,relative=subprojects/apache-felix-web-console/*.adoc]
+**** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc[]
+**** xref:subprojects/apache-felix-web-console/web-console-restful-api.adoc[]
+**** xref:subprojects/apache-felix-web-console/web-console-security-provider.adoc[]
 
 **** Extensions
-//indexList::[level=5,relative=documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/*.adoc]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc[]
-***** xref:master@documentation:ROOT:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc[]
-
-*** MOSGI (retired)
-//indexList::[level=4,relative=documentation/subprojects/mosgi-managed-osgi-framework/*.adoc]
-**** xref:master@documentation:ROOT:documentation/subprojects/mosgi-managed-osgi-framework/probeguide.adoc[]
+//indexList::[level=5,relative=subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/*.adoc]
+***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc[]
+***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc[]
+***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc[]
+***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc[]
+***** xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc[]
 
 ** Tutorials
-//indexList::[level=3,relative=documentation/tutorials-examples-and-presentations/*.adoc]
-*** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-application-demonstration.adoc[]
-*** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc[]
-*** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc[]
+//indexList::[level=3,relative=tutorials-examples-and-presentations/*.adoc]
+*** xref:tutorials-examples-and-presentations/apache-felix-application-demonstration.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc[]
+*** xref:tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc[]
 
 *** OSGI Tutorial
-//indexList::[level=4,relative=documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/*.adoc]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc[]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc[]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc[]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc[]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc[]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc[]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc[]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc[]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc[]
-**** xref:master@documentation:ROOT:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc[]
+//indexList::[level=4,relative=tutorials-examples-and-presentations/apache-felix-osgi-tutorial/*.adoc]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc[]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc[]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc[]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc[]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc[]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc[]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc[]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc[]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc[]
+**** xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc[]
 
diff --git a/modules/ROOT/pages/auto-index.adoc b/modules/ROOT/pages/auto-index.adoc
index 4f7ad9e..322c944 100644
--- a/modules/ROOT/pages/auto-index.adoc
+++ b/modules/ROOT/pages/auto-index.adoc
@@ -4,85 +4,61 @@
 
 indexList::[relative=*.adoc]
 
-* Documentation
-
-indexList::[level=2,relative=documentation/*.adoc]
-
 ** Community
 
-indexList::[level=3,relative=documentation/community/*.adoc]
+indexList::[level=3,relative=community/*.adoc]
 
 ** Development
 
-indexList::[level=3,relative=documentation/development/*.adoc]
+indexList::[level=3,relative=development/*.adoc]
 
 ** FAQS
 
-indexList::[level=3,relative=documentation/faqs/*.adoc]
+indexList::[level=3,relative=faqs/*.adoc]
 
 ** Subprojects
 
-indexList::[level=3,relative=documentation/subprojects/*.adoc]
-
-*** Commons (retired)
-
-indexList::[level=4,relative=documentation/subprojects/apache-felix-commons/*.adoc]
+indexList::[level=3,relative=subprojects/*.adoc]
 
 *** Dependency Manager
 **** Guides
 
-indexList::[level=5,relative=documentation/subprojects/apache-felix-dependency-manager/guides/*.adoc]
+indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/guides/*.adoc]
 
 **** Reference
 
-indexList::[level=5,relative=documentation/subprojects/apache-felix-dependency-manager/reference/*.adoc]
+indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/reference/*.adoc]
 
 **** Tutorials
 
-indexList::[level=5,relative=documentation/subprojects/apache-felix-dependency-manager/tutorials/*.adoc]
+indexList::[level=5,relative=subprojects/apache-felix-dependency-manager/tutorials/*.adoc]
 
 *** Framework
 
-indexList::[level=4,relative=documentation/subprojects/apache-felix-framework/*.adoc]
+indexList::[level=4,relative=subprojects/apache-felix-framework/*.adoc]
 
 *** GoGo Shell
 
-indexList::[level=4,relative=documentation/subprojects/apache-felix-gogo/*.adoc]
-
-*** iPOJO (retired)
-
-indexList::[level=4,relative=documentation/subprojects/apache-felix-ipojo/**/*.adoc]
+indexList::[level=4,relative=subprojects/apache-felix-gogo/*.adoc]
 
 *** Maven SCR plugin
 
-indexList::[level=4,relative=documentation/subprojects/apache-felix-maven-scr-plugin/*.adoc]
-
-*** UPNP (retired)
-
-indexList::[level=4,relative=documentation/subprojects/apache-felix-upnp/**/*.adoc]
-
-*** User Admin (retired)
-
-indexList::[level=4,relative=documentation/subprojects/apache-felix-user-admin/*.adoc]
+indexList::[level=4,relative=subprojects/apache-felix-maven-scr-plugin/*.adoc]
 
 *** Web Console
 
-indexList::[level=4,relative=documentation/subprojects/apache-felix-web-console/*.adoc]
+indexList::[level=4,relative=subprojects/apache-felix-web-console/*.adoc]
 
 **** Extensions
 
-indexList::[level=5,relative=documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/*.adoc]
-
-*** MOSGI (retired)
-
-indexList::[level=4,relative=documentation/subprojects/mosgi-managed-osgi-framework/*.adoc]
+indexList::[level=5,relative=subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/*.adoc]
 
 ** Tutorials
 
-indexList::[level=3,relative=documentation/tutorials-examples-and-presentations/*.adoc]
+indexList::[level=3,relative=tutorials-examples-and-presentations/*.adoc]
 
 *** OSGI Tutorial
 
-indexList::[level=4,relative=documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/*.adoc]
+indexList::[level=4,relative=tutorials-examples-and-presentations/apache-felix-osgi-tutorial/*.adoc]
 
 //indexList::[]
diff --git a/modules/ROOT/pages/documentation/community.adoc b/modules/ROOT/pages/community.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/community.adoc
rename to modules/ROOT/pages/community.adoc
diff --git a/modules/ROOT/pages/documentation/community/contributing.adoc b/modules/ROOT/pages/community/contributing.adoc
similarity index 92%
rename from modules/ROOT/pages/documentation/community/contributing.adoc
rename to modules/ROOT/pages/community/contributing.adoc
index 672fcd4..7576f4d 100644
--- a/modules/ROOT/pages/documentation/community/contributing.adoc
+++ b/modules/ROOT/pages/community/contributing.adoc
@@ -2,7 +2,7 @@
 
 Apache Felix is a volunteer effort, so there is always plenty of work that needs to be accomplished.
 If you want to help support Felix, this page is intended as a starting point for specific contribution ideas.
-To further understand how the Felix community operates, refer to the https://www.apache.org/foundation/how-it-works.html[Community Roles and Processes] document and/or join the xref:documentation/community/project-info.adoc[mailing lists].
+To further understand how the Felix community operates, refer to the https://www.apache.org/foundation/how-it-works.html[Community Roles and Processes] document and/or join the xref:community/project-info.adoc[mailing lists].
 
 The Felix project organizes its "to do" list using the https://issues.apache.org/jira/browse/Felix[JIRA] issue tracking system.
 Specific items from Felix' JIRA issue tracking system are highlighted on this page, but are not limited to it.
@@ -18,7 +18,7 @@ There is no specific JIRA issue for this task, but any contributions could be po
 
 == Programmers
 
-Before contributing, make sure to be subscribed to the xref:documentation/community/project-info.adoc[developer mailing list].
+Before contributing, make sure to be subscribed to the xref:community/project-info.adoc[developer mailing list].
 If you don't have your own issue to scratch, you can browse open issues in https://issues.apache.org/jira/browse/Felix[JIRA] and submit a patch.
 
 Source code contributions fall into two categories: pull requests or grants.
@@ -48,7 +48,7 @@ For grants, you should:
 +
 [cols=2*]
 |===
-| Review our xref:documentation/development.adoc[developer documentation] as well as the general [Apache documentation
+| Review our xref:development.adoc[developer documentation] as well as the general [Apache documentation
 | https://www.apache.org/foundation/getinvolved.html] to determine whether you would really like be involved with us and how we work.
 |===
 
diff --git a/modules/ROOT/pages/documentation/community/project-info.adoc b/modules/ROOT/pages/community/project-info.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/community/project-info.adoc
rename to modules/ROOT/pages/community/project-info.adoc
diff --git a/modules/ROOT/pages/documentation/community/projects-using-felix.adoc b/modules/ROOT/pages/community/projects-using-felix.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/community/projects-using-felix.adoc
rename to modules/ROOT/pages/community/projects-using-felix.adoc
diff --git a/modules/ROOT/pages/documentation/development.adoc b/modules/ROOT/pages/development.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/development.adoc
rename to modules/ROOT/pages/development.adoc
diff --git a/modules/ROOT/pages/documentation/development/coding-standards.adoc b/modules/ROOT/pages/development/coding-standards.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/development/coding-standards.adoc
rename to modules/ROOT/pages/development/coding-standards.adoc
diff --git a/modules/ROOT/pages/documentation/development/dependencies-file-template.adoc b/modules/ROOT/pages/development/dependencies-file-template.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/development/dependencies-file-template.adoc
rename to modules/ROOT/pages/development/dependencies-file-template.adoc
diff --git a/modules/ROOT/pages/documentation/development/provisional-osgi-api-policy.adoc b/modules/ROOT/pages/development/provisional-osgi-api-policy.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/development/provisional-osgi-api-policy.adoc
rename to modules/ROOT/pages/development/provisional-osgi-api-policy.adoc
diff --git a/modules/ROOT/pages/documentation/development/release-management-nexus.adoc b/modules/ROOT/pages/development/release-management-nexus.adoc
similarity index 99%
rename from modules/ROOT/pages/documentation/development/release-management-nexus.adoc
rename to modules/ROOT/pages/development/release-management-nexus.adoc
index 2ffef1a..d91ee90 100644
--- a/modules/ROOT/pages/documentation/development/release-management-nexus.adoc
+++ b/modules/ROOT/pages/development/release-management-nexus.adoc
@@ -65,7 +65,7 @@ Everything else has been configured in the latest Felix parent POM:
 
 First prepare your POMs for release:
 
-. Make sure you have correct NOTICE, xref:documentation/development/dependencies-file-template.adoc[DEPENDENCIES], and LICENSE files.
+. Make sure you have correct NOTICE, xref:development/dependencies-file-template.adoc[DEPENDENCIES], and LICENSE files.
 Remember to update the copyright year.
 . Make sure you have an updated change log file, typically in `doc/changelog.txt` but in the project root is also acceptable.
 . Make sure there are no snapshots in the POMs to be released
diff --git a/modules/ROOT/pages/documentation/development/site-how-to.adoc b/modules/ROOT/pages/development/site-how-to.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/development/site-how-to.adoc
rename to modules/ROOT/pages/development/site-how-to.adoc
diff --git a/modules/ROOT/pages/documentation/development/using-the-osgi-compliance-tests.adoc b/modules/ROOT/pages/development/using-the-osgi-compliance-tests.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/development/using-the-osgi-compliance-tests.adoc
rename to modules/ROOT/pages/development/using-the-osgi-compliance-tests.adoc
diff --git a/modules/ROOT/pages/documentation.adoc b/modules/ROOT/pages/documentation.adoc
index 7fe8260..9f6384c 100644
--- a/modules/ROOT/pages/documentation.adoc
+++ b/modules/ROOT/pages/documentation.adoc
@@ -2,18 +2,18 @@
 
 In an effort to make it easier to find desired documentation, we have divided our documentation section into the following six areas:
 
-* xref:documentation/getting-started.adoc[Getting started] - This area captures a few links from the areas below that will help you get started with Felix.
-* xref:documentation/faqs.adoc[FAQs] - This area captures all FAQ documentation, which typically varies from subproject to subproject.
-* xref:documentation/community.adoc[Community] - This area captures documentation associated with how the Felix community works and how to become involved in it.
-* xref:documentation/development.adoc[Development] - This area captures documentation for Felix developers or those interested in becoming Felix developers;
+* xref:getting-started.adoc[Getting started] - This area captures a few links from the areas below that will help you get started with Felix.
+* xref:faqs.adoc[FAQs] - This area captures all FAQ documentation, which typically varies from subproject to subproject.
+* xref:community.adoc[Community] - This area captures documentation associated with how the Felix community works and how to become involved in it.
+* xref:development.adoc[Development] - This area captures documentation for Felix developers or those interested in becoming Felix developers;
 this is not intended for Felix users although some information may be useful.
-* xref:documentation/subprojects.adoc[Subprojects] - This area captures user documentation for the various Felix subprojects.
-* xref:documentation/tutorials-examples-and-presentations.adoc[Tutorials, examples, and presentations] - This area captures general user documentation that does not necessarily fit into any single subproject.
+* xref:subprojects.adoc[Subprojects] - This area captures user documentation for the various Felix subprojects.
+* xref:tutorials-examples-and-presentations.adoc[Tutorials, examples, and presentations] - This area captures general user documentation that does not necessarily fit into any single subproject.
 
 In addition a xref:auto-index.adoc[site map] is available as a table of contents of the site.
 
-If you are unable to find the documentation you need, please ask on the xref:{{ refs.mailinglists.adoc[mailing lists].
+If you are unable to find the documentation you need, please ask on the xref:mailinglists.adoc[mailing lists].
 Also, feedback on improving the documentation and/or organization of this site is welcome.
 
 _The Felix web site and documentation are managed with link:https://antora.org[Antora].
-For Apache Felix specific information see the xref:documentation/development/site-how-to.adoc[Site How-To]._
+For Apache Felix specific information see the xref:development/site-how-to.adoc[Site How-To]._
diff --git a/modules/ROOT/pages/documentation/faqs.adoc b/modules/ROOT/pages/documentation/faqs.adoc
deleted file mode 100644
index 4a8ef1b..0000000
--- a/modules/ROOT/pages/documentation/faqs.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-= Frequently Asked Questions
-
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc[OSGi FAQ] - Contains answers to general OSGi-related questions.
-* xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.adoc[Framework FAQ] - Contains answers to questions that are specifically related to Felix' OSGi framework implementation.
-* xref:documentation/faqs/apache-felix-bundle-plugin-faq.adoc[Bundle Plugin FAQ] - Contains answers to questions about the Felix maven-bundle-plugin
-* xref:documentation/faqs/apache-felix-scr-plugin-faq.adoc[SCR Plugin FAQ] - Contains answers to questions about the Felix maven-scr-plugin
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager.adoc b/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager.adoc
deleted file mode 100644
index 5bee1cc..0000000
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager.adoc
+++ /dev/null
@@ -1,64 +0,0 @@
-= Apache Felix Dependency Manager
-
-Welcome to the Dependency Manager, a great bundle for managing your components and dependencies!
-
-== Introduction
-
-In a service oriented architecture, applications are built out of components that are packaged in bundles and interact through services.
-These components, that both publish services and depend on other services, form networks that are often dynamic in nature.
-That makes managing these dependencies something the developer needs to address.
-
-Whilst the OSGi framework provides the low-level building blocks to do that in the form of service listeners and trackers, these should not be used directly by developers.
-Instead, a more declarative approach works best, and the Dependency Manager provides this in the form of a declarative API and/or annotations that allow you to dynamically declare and change dependencies.
-
-On top of that, a set of OSGi design patterns are defined and supported that can be used as building blocks for more complex applications.
-
-The documentation for the dependency manager is split into three sections:
-
-. Step-by-step tutorials which provide a good introduction to the technology and should get you started quickly.
-. Overviews and guides that provide more in-depth knowledge about specific aspects of the dependency manager.
-. Reference materials that describe all the individual nuts and bolts.
-
-Below is the full table of contents.
-
-== Table of Contents
-
-=== Step-by-step Tutorials
-
-* xref:documentation/subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc[Getting started]
-* xref:documentation/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc[Leveraging the shell]
-* xref:documentation/subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc[Hello World example projects]
-
-=== Overviews and Guides
-
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/history.adoc[History]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/background.adoc[Background]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc[What's new in DM 4]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc[What's new in release r15]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc[Bundles and dependencies]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc[Migrating from earlier versions]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc[Performance Tuning]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/development.adoc[Development]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc[Design Patterns]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/resources.adoc[Resource Adapters]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.adoc[Javadocs]
-
-=== Reference Guide
-
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/components.adoc[Components]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc[Singleton]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[Aspect]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc[Adapter]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc[Resource Adapter]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc[Bundle Adapter]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc[Factory Configuration Adapter]
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.adoc[Dependencies]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc[Service]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc[Configuration]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc[Bundle]
- ** xref:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc[Resource]
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc[Service Scopes]
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc[Dependency Manager Annotations]
-* xref:documentation/subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc[Dependency Manager Lambda]
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.adoc[Thread Model]
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/external-links.adoc[External Links and Articles]
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc b/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc
deleted file mode 100644
index d93253b..0000000
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-= Extending the Apache Felix Web Console
-
-The xref:documentation/subprojects/apache-felix-web-console.adoc[Apache Felix Web Console] is extensible in various ways described no these pages:
-
-* xref:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc[Providing Web Console Plugins]
-* xref:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc[Providing Resources]
-* xref:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc[Branding the Web Console]
-* xref:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc[Web Console Output Templating]
-* xref:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc[Web Console Logging]
-* xref:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-security-provider.adoc[Web Console Security Provider]
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc b/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc
deleted file mode 100644
index f5f4915..0000000
--- a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-= Apache Felix OSGi Tutorial
-
-This tutorial creates successively more complex OSGi bundles to illustrate most of the features and functionality offered by the OSGi framework.
-
-Trails:
-
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc[Apache Felix Tutorial Example 1]: A bundle that listens for OSGi service events.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc[Apache Felix Tutorial Example 2]: A bundle that implements a dictionary service.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc[Apache Felix Tutorial Example 2b]: A bundle that implements another dictionary service.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc[Apache Felix Tutorial Example 3]: A bundle that implements a simple dictionary service client.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc[Apache Felix Tutorial Example 4]: A bundle that implements a more robust dictionary service client.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc[Apache Felix Tutorial Example 5]: A bundle that implements a dictionary service client using the Service Tracker.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc[Apache Felix Tutorial Example 6]: A bundle that implements a spell checker service using dictionary services.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc[Apache Felix Tutorial Example 7]: A bundle that implements a spell checker service client.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc[Apache Felix Tutorial Example 8]: A bundle that implements a spell checker service using Service Binder.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc[Apache Felix Tutorial Example 9]: A bundle that implements a spell checker service using Declarative Services.
diff --git a/modules/ROOT/pages/faqs.adoc b/modules/ROOT/pages/faqs.adoc
new file mode 100644
index 0000000..37077c4
--- /dev/null
+++ b/modules/ROOT/pages/faqs.adoc
@@ -0,0 +1,6 @@
+= Frequently Asked Questions
+
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc[OSGi FAQ] - Contains answers to general OSGi-related questions.
+* xref:subprojects/apache-felix-framework/apache-felix-framework-faq.adoc[Framework FAQ] - Contains answers to questions that are specifically related to Felix' OSGi framework implementation.
+* xref:faqs/apache-felix-bundle-plugin-faq.adoc[Bundle Plugin FAQ] - Contains answers to questions about the Felix maven-bundle-plugin
+* xref:faqs/apache-felix-scr-plugin-faq.adoc[SCR Plugin FAQ] - Contains answers to questions about the Felix maven-scr-plugin
diff --git a/modules/ROOT/pages/documentation/faqs/apache-felix-bundle-plugin-faq.adoc b/modules/ROOT/pages/faqs/apache-felix-bundle-plugin-faq.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/faqs/apache-felix-bundle-plugin-faq.adoc
rename to modules/ROOT/pages/faqs/apache-felix-bundle-plugin-faq.adoc
diff --git a/modules/ROOT/pages/documentation/faqs/apache-felix-scr-plugin-faq.adoc b/modules/ROOT/pages/faqs/apache-felix-scr-plugin-faq.adoc
similarity index 97%
rename from modules/ROOT/pages/documentation/faqs/apache-felix-scr-plugin-faq.adoc
rename to modules/ROOT/pages/faqs/apache-felix-scr-plugin-faq.adoc
index b83a9d7..d1cecdc 100644
--- a/modules/ROOT/pages/documentation/faqs/apache-felix-scr-plugin-faq.adoc
+++ b/modules/ROOT/pages/faqs/apache-felix-scr-plugin-faq.adoc
@@ -3,7 +3,7 @@
 
 
 This page provides answers to frequently asked questions using the Maven SCR Plugin.
-See xref:documentation/subprojects/apache-felix-maven-scr-plugin.adoc[] for documentation on that plugin.
+See xref:subprojects/apache-felix-maven-scr-plugin.adoc[] for documentation on that plugin.
 
 == Should I still use the Apache Felix SCR annotations over the official OSGi annotations?
 
diff --git a/modules/ROOT/pages/documentation/getting-started.adoc b/modules/ROOT/pages/getting-started.adoc
similarity index 54%
rename from modules/ROOT/pages/documentation/getting-started.adoc
rename to modules/ROOT/pages/getting-started.adoc
index 39ddfec..ee61164 100644
--- a/modules/ROOT/pages/documentation/getting-started.adoc
+++ b/modules/ROOT/pages/getting-started.adoc
@@ -3,9 +3,9 @@
 For first-time users, here are a few links that might get you started more quickly:
 
 * https://felix.apache.org/downloads.cgi[Downloads] - Go to the download page and download and extract the Felix release.
-* xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc[Launching Felix] - Go to the Felix usage page to learn how to launch the Felix framework.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc[OSGi tutorial] - Go to the tutorial page to learn some OSGi basics.
-* xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc[OSGi FAQ] - Check out the OSGi FAQ for answers to common questions.
+* xref:subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc[Launching Felix] - Go to the Felix usage page to learn how to launch the Felix framework.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc[OSGi tutorial] - Go to the tutorial page to learn some OSGi basics.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc[OSGi FAQ] - Check out the OSGi FAQ for answers to common questions.
 * xref:documentation.adoc[Documentation] - Search the documentation pages for additional examples and presentations or subproject documentation to learn about specific subprojects.
 
 If you are unable to find the documentation you need, please ask on the xref:mailinglists.adoc[mailing lists].
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
index 3e3e5d1..96634a7 100644
--- a/modules/ROOT/pages/index.adoc
+++ b/modules/ROOT/pages/index.adoc
@@ -15,5 +15,5 @@ Refer to the news xref:news.adoc[archive] for all news.
 
 The Felix project is organized into subprojects, where each subproject targets a specific OSGi specification or OSGi-related technology.
 
-Please refer to the xref:documentation/subprojects.adoc[Subprojects] page for a complete list of subprojects.
-To see some projects using Felix subprojects, refer to the xref:documentation/community/projects-using-felix.adoc[Projects Using Felix] documentation.
+Please refer to the xref:subprojects.adoc[Subprojects] page for a complete list of subprojects.
+To see some projects using Felix subprojects, refer to the xref:community/projects-using-felix.adoc[Projects Using Felix] documentation.
diff --git a/modules/ROOT/pages/documentation/subprojects.adoc b/modules/ROOT/pages/subprojects.adoc
similarity index 82%
rename from modules/ROOT/pages/documentation/subprojects.adoc
rename to modules/ROOT/pages/subprojects.adoc
index f4396b1..d91e1e2 100644
--- a/modules/ROOT/pages/documentation/subprojects.adoc
+++ b/modules/ROOT/pages/subprojects.adoc
@@ -30,31 +30,31 @@ If this project is not using Maven, refer to the docs for the subproject on how
 | An implementation of the https://osgi.org/specification/osgi.cmpn/7.0.0/service.cm.html[OSGi Configuration Admin service specification] for managing bundle configuration properties.
 | https://github.com/apache/felix-dev/tree/master/configadmin[source]
 
-| xref:documentation/subprojects/apache-felix-dependency-manager.adoc[Dependency Manager]
+| xref:subprojects/apache-felix-dependency-manager.adoc[Dependency Manager]
 | An API-based component model to simplify OSGi-based development.
 | https://github.com/apache/felix-dev/tree/master/dependencymanager[source]
 
-| xref:documentation/subprojects/apache-felix-event-admin.adoc[Event Admin]
+| xref:subprojects/apache-felix-event-admin.adoc[Event Admin]
 | An implementation of the OSGi Event Admin service specification for event-based communication.
 | https://github.com/apache/felix-dev/tree/master/eventadmin[source]
 
-| xref:documentation/subprojects/apache-felix-file-install.adoc[File Install]
+| xref:subprojects/apache-felix-file-install.adoc[File Install]
 | A simple, directory-based management agent for managing bundle deployment.
 | https://github.com/apache/felix-dev/tree/master/fileinstall[source]
 
-| xref:documentation/subprojects/apache-felix-framework.adoc[Framework]
+| xref:subprojects/apache-felix-framework.adoc[Framework]
 | An implementation of the OSGi R7 core framework.
 | https://github.com/apache/felix-dev/tree/master/framework[source]
 
-| xref:documentation/subprojects/apache-felix-framework-security.adoc[Framework Security]
+| xref:subprojects/apache-felix-framework-security.adoc[Framework Security]
 |
 | https://github.com/apache/felix-dev/tree/master/framework.security[source]
 
-| xref:documentation/subprojects/apache-felix-gogo.adoc[Gogo]
+| xref:subprojects/apache-felix-gogo.adoc[Gogo]
 | An advanced shell for interacting with OSGi frameworks.
 | https://github.com/apache/felix-dev/tree/master/gogo[source]
 
-| xref:documentation/subprojects/apache-felix-healthchecks.adoc[Health Checks]
+| xref:subprojects/apache-felix-healthchecks.adoc[Health Checks]
 | An extensible framework to monitor the status of the OSGi container at runtime.
 | https://github.com/apache/felix-dev/tree/master/healthcheck[source]
 
@@ -62,35 +62,35 @@ If this project is not using Maven, refer to the docs for the subproject on how
 | An implementation of the https://osgi.org/specification/osgi.cmpn/7.0.0/service.http.whiteboard.html[OSGi HTTP Whiteboard] and https://osgi.org/specification/osgi.cmpn/7.0.0/service.http.html[Http Service specification].
 | https://github.com/apache/felix-dev/tree/master/http[source]
 
-| xref:documentation/subprojects/apache-felix-inventory.adoc[Inventory Printer]
+| xref:subprojects/apache-felix-inventory.adoc[Inventory Printer]
 | A simple and extensible framework to retrieve inventory information about applications running in an OSGi Framework.
 | https://github.com/apache/felix-dev/tree/master/inventory[source]
 
-| xref:documentation/subprojects/apache-felix-log.adoc[Log]
+| xref:subprojects/apache-felix-log.adoc[Log]
 | A simple, memory-based implementation of the OSGi Log service specification.
 | https://github.com/apache/felix-dev/tree/master/log[source]
 
-| xref:documentation/subprojects/apache-felix-logback.adoc[Logback]
+| xref:subprojects/apache-felix-logback.adoc[Logback]
 | Apache Felix Logback is a small integration of the https://logback.qos.ch/[Logback] backend with OSGi.
 | https://github.com/apache/felix-dev/tree/master/logback[source]
 
-| xref:documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.adoc[Maven Bundle Plugin]
+| xref:subprojects/apache-felix-maven-bundle-plugin-bnd.adoc[Maven Bundle Plugin]
 | A Maven plugin to simplify building bundles.
 | https://github.com/apache/felix-dev/tree/master/tools/maven-bundle-plugin[source]
 
-| xref:documentation/subprojects/apache-felix-metatype-service.adoc[Metatype]
+| xref:subprojects/apache-felix-metatype-service.adoc[Metatype]
 | An implementation of the OSGi Metatype service to describe types needed by bundles.
 | https://github.com/apache/felix-dev/tree/master/shell[source]
 
-| xref:documentation/subprojects/apache-felix-osgi-bundle-repository.adoc[OSGi Bundle Repository]
+| xref:subprojects/apache-felix-osgi-bundle-repository.adoc[OSGi Bundle Repository]
 | A bundle repository service to simplify discovering and deploying bundles and their dependencies.
 | https://github.com/apache/felix-dev/tree/master/org.osgi.service.obr[source]
 
-| xref:documentation/subprojects/apache-felix-preferences-service.adoc[Preferences Service]
+| xref:subprojects/apache-felix-preferences-service.adoc[Preferences Service]
 | An implementation of the OSGi Preferences service specification for storing settings and preferences.
 | https://github.com/apache/felix-dev/tree/master/preferences[source]
 
-| xref:documentation/subprojects/apache-felix-remote-shell.adoc[Remote Shell]
+| xref:subprojects/apache-felix-remote-shell.adoc[Remote Shell]
 | A remote, text-based interface to the Apache Felix Shell.
 | https://github.com/apache/felix-dev/tree/master/shell.remote[source]
 
@@ -98,15 +98,15 @@ If this project is not using Maven, refer to the docs for the subproject on how
 | An implementation of the https://osgi.org/specification/osgi.cmpn/7.0.0/service.component.html[OSGi Declarative Services specification] providing a service-oriented component model to simplify OSGi-based development.
 | https://github.com/apache/felix-dev/tree/master/scr[source]
 
-| xref:documentation/subprojects/apache-felix-shell.adoc[Shell]
+| xref:subprojects/apache-felix-shell.adoc[Shell]
 | A very simple shell service implemented as a bundle for interacting with an OSGi framework instance.
 | https://github.com/apache/felix-dev/tree/master/shell[source]
 
-| xref:documentation/subprojects/apache-felix-shell-tui.adoc[Shell TUI]
+| xref:subprojects/apache-felix-shell-tui.adoc[Shell TUI]
 | A simple, text-based interface to the Apache Felix Shell.
 | https://github.com/apache/felix-dev/tree/master/shell.tui[source]
 
-| xref:documentation/subprojects/apache-felix-web-console.adoc[Web Console]
+| xref:subprojects/apache-felix-web-console.adoc[Web Console]
 | A simple tool to inspect and manage OSGi framework instances using your favorite Web Browser.
 | https://github.com/apache/felix-dev/tree/master/webconsole[source]
 |===
diff --git a/modules/ROOT/pages/subprojects/apache-felix-dependency-manager.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager.adoc
new file mode 100644
index 0000000..2a1364e
--- /dev/null
+++ b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager.adoc
@@ -0,0 +1,64 @@
+= Apache Felix Dependency Manager
+
+Welcome to the Dependency Manager, a great bundle for managing your components and dependencies!
+
+== Introduction
+
+In a service oriented architecture, applications are built out of components that are packaged in bundles and interact through services.
+These components, that both publish services and depend on other services, form networks that are often dynamic in nature.
+That makes managing these dependencies something the developer needs to address.
+
+Whilst the OSGi framework provides the low-level building blocks to do that in the form of service listeners and trackers, these should not be used directly by developers.
+Instead, a more declarative approach works best, and the Dependency Manager provides this in the form of a declarative API and/or annotations that allow you to dynamically declare and change dependencies.
+
+On top of that, a set of OSGi design patterns are defined and supported that can be used as building blocks for more complex applications.
+
+The documentation for the dependency manager is split into three sections:
+
+. Step-by-step tutorials which provide a good introduction to the technology and should get you started quickly.
+. Overviews and guides that provide more in-depth knowledge about specific aspects of the dependency manager.
+. Reference materials that describe all the individual nuts and bolts.
+
+Below is the full table of contents.
+
+== Table of Contents
+
+=== Step-by-step Tutorials
+
+* xref:subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc[Getting started]
+* xref:subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc[Leveraging the shell]
+* xref:subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc[Hello World example projects]
+
+=== Overviews and Guides
+
+* xref:subprojects/apache-felix-dependency-manager/guides/history.adoc[History]
+* xref:subprojects/apache-felix-dependency-manager/guides/background.adoc[Background]
+* xref:subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc[What's new in DM 4]
+* xref:subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc[What's new in release r15]
+* xref:subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc[Bundles and dependencies]
+* xref:subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc[Migrating from earlier versions]
+* xref:subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc[Performance Tuning]
+* xref:subprojects/apache-felix-dependency-manager/guides/development.adoc[Development]
+* xref:subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc[Design Patterns]
+* xref:subprojects/apache-felix-dependency-manager/guides/resources.adoc[Resource Adapters]
+* xref:subprojects/apache-felix-dependency-manager/guides/javadocs.adoc[Javadocs]
+
+=== Reference Guide
+
+* xref:subprojects/apache-felix-dependency-manager/reference/components.adoc[Components]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc[Singleton]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[Aspect]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc[Adapter]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc[Resource Adapter]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc[Bundle Adapter]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc[Factory Configuration Adapter]
+* xref:subprojects/apache-felix-dependency-manager/reference/dependencies.adoc[Dependencies]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc[Service]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc[Configuration]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc[Bundle]
+ ** xref:subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc[Resource]
+* xref:subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc[Service Scopes]
+* xref:subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc[Dependency Manager Annotations]
+* xref:subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc[Dependency Manager Lambda]
+* xref:subprojects/apache-felix-dependency-manager/reference/thread-model.adoc[Thread Model]
+* xref:subprojects/apache-felix-dependency-manager/reference/external-links.adoc[External Links and Articles]
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/annotations.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/annotations.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/annotations.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/annotations.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/background.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/background.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/background.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/background.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/bundles-and-dependencies.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/design-patterns.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/development.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/development.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/development.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/development.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/dm-lambda.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/history.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/history.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/history.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/history.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/javadocs.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/javadocs.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/javadocs.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/migrating-from-earlier-versions.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/migrating-from-other-solutions.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/performance-tuning.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/resources.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/resources.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/resources.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/resources.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc
similarity index 98%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc
index ffac713..f5946a9 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/whatsnew-r15.adoc
@@ -152,7 +152,7 @@ Notice that the dm runtime is compatible with old and new annotations version, s
 * propagated configuration dependencies are now taking precedence over component service properties, meaning that a component is defined with some service properties, then the service properties which are also found from the propagated configuration will be overriden (by the configuration properties)
 * Since some incompatible changes have been made, the major version of the annotation bundle has been bumped to 5.0.0.
 
-Please check new xref:documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc[dependency manager annotations doc]
+Please check new xref:subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc[dependency manager annotations doc]
 
 === Not backward compatible annotation changes
 
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc
similarity index 98%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc
index e9955ea..9e1c095 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/guides/whatsnew.adoc
@@ -32,7 +32,7 @@ See also the following property in the org.apache.felix.dependencymanager.sample
 
 Here, all components will be handled by Executors provided by the ComponentExecutorFactory, except those having a package starting with "org.apache.felix.dependencymanager.samples.tpool" (because the threadpool is itself defined using the Dependency Manager API).
 
-You will find a full description of the new thread model in the xref:documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.adoc[Reference] section.
+You will find a full description of the new thread model in the xref:subprojects/apache-felix-dependency-manager/reference/thread-model.adoc[Reference] section.
 
 == New features
 
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc
similarity index 89%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc
index c9fef08..9266000 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc
@@ -1,6 +1,6 @@
 = Dependency Manager - Adapter
 
-Adapters, like xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[aspects], are used to "extend" existing services, and can publish  different services based on the existing one.
+Adapters, like xref:subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[aspects], are used to "extend" existing services, and can publish  different services based on the existing one.
 An example would be implementing a management interface.
 
 An adapter will be applied to any service that matches the specified interface and filter.
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/components.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/components.adoc
similarity index 91%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/components.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/components.adoc
index a4942e6..82e971b 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/components.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/components.adoc
@@ -10,20 +10,20 @@ You can either use the Java API or the Java Annotations and this reference secti
 
 There are different types of Dependency Manager components:
 
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc[_Component_]: Components are the main building blocks for OSGi applications.
+* xref:subprojects/apache-felix-dependency-manager/reference/component-singleton.adoc[_Component_]: Components are the main building blocks for OSGi applications.
 They can publish themselves as a service, and/or they can have dependencies.
 These dependencies will influence their life cycle as component will only be activated when all required dependencies are available.
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[_Aspect Service_]: A service that provides a non-functional aspect on top of an existing service.
+* xref:subprojects/apache-felix-dependency-manager/reference/component-aspect.adoc[_Aspect Service_]: A service that provides a non-functional aspect on top of an existing service.
 In aspect oriented programming, an aspect, or interceptor can sit between a client and another target service used by the client.
 An Aspect Service first tracks a target service and is created once the target service is detected.
 Then the Aspect Service is provided, but with a higher  ranking, and the client is transparently updated with the aspect.
 Aspects can be chained and may apply to the same target service (and in this case, the ranking of the Aspect service is used to chain aspects in  the proper order).
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc[_Adapter Service_]: A Service that adapts another existing service into a new one.
+* xref:subprojects/apache-felix-dependency-manager/reference/component-adapter.adoc[_Adapter Service_]: A Service that adapts another existing service into a new one.
 Like with aspects, sometimes you want to create adapters for certain services, which add certain behavior that results in the publication of (in this case) a different service.
 Adapters can dynamically be added and removed and allow you to keep your basic services implementations clean and simple, adding extra features on top of them in a modular way.
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc[_Bundle Adapter Service_]: creates an OSGi service a service on top of a given bundle.
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc[_Resource Adapter Service_]: creates an OSGi service on top of a specific Resource.
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc[_Factory Configuration Adapter Service_]: creates an OSGi service from ConfigAdmin, using a factoryPid, and a ManagedServiceFactory.
+* xref:subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.adoc[_Bundle Adapter Service_]: creates an OSGi service a service on top of a given bundle.
+* xref:subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.adoc[_Resource Adapter Service_]: creates an OSGi service on top of a specific Resource.
+* xref:subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.adoc[_Factory Configuration Adapter Service_]: creates an OSGi service from ConfigAdmin, using a factoryPid, and a ManagedServiceFactory.
 
 == Life cycle
 
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependencies.adoc
similarity index 83%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependencies.adoc
index 0804cef..868e4b5 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependencies.adoc
@@ -22,10 +22,10 @@ If you don't, they'll be invoked on the component instance.
 
 Out of the box, several types of dependencies are supported:
 
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc[Service]
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc[Configuration]
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc[Bundle]
-* xref:documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc[Resource]
+* xref:subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc[Service]
+* xref:subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc[Configuration]
+* xref:subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc[Bundle]
+* xref:subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc[Resource]
 
 However, it's quite easy to add your own custom type of dependency too, as is described below.
 
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependency-resource.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dependency-service.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/diagrams/statediagram.uxf b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/diagrams/statediagram.uxf
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/diagrams/statediagram.uxf
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/diagrams/statediagram.uxf
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/dm-annotations.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/external-links.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/external-links.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/external-links.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/external-links.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/service-scopes.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/thread-model.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/reference/thread-model.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/dm.hello.tgz b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/dm.hello.tgz
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/dm.hello.tgz
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/dm.hello.tgz
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/getting-started.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/leveraging-the-shell.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/sample-code.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.adoc b/modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-dependency-manager/tutorials/working-with-annotations.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-event-admin.adoc b/modules/ROOT/pages/subprojects/apache-felix-event-admin.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-event-admin.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-event-admin.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-file-install.adoc b/modules/ROOT/pages/subprojects/apache-felix-file-install.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-file-install.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-file-install.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework-security.adoc b/modules/ROOT/pages/subprojects/apache-felix-framework-security.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-framework-security.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-framework-security.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework.adoc b/modules/ROOT/pages/subprojects/apache-felix-framework.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-framework.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-framework.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc b/modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc
similarity index 97%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc
index f509526..24dba9f 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-bundle-cache.adoc
@@ -85,7 +85,7 @@ either way it is necessary to increment the refresh count and rename the revisio
 == Configuring Default Behavior
 
 It is possible to modify the default behavior of Felix' bundle cache by setting certain configuration properties;
-see the xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc#_configuring_the_framework[usage document] for information on how to set configuration properties for Felix.
+see the xref:subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc#_configuring_the_framework[usage document] for information on how to set configuration properties for Felix.
 Felix' bundle cache recognizes the following configuration properties:
 
 * `org.osgi.framework.storage` - Sets the directory to use as the bundle cache;
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc b/modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.adoc b/modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-faq.adoc
similarity index 88%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-faq.adoc
index d1caee7..e67e8e7 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-faq.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-faq.adoc
@@ -4,15 +4,15 @@
 
 == Is the Felix framework compliant with the OSGi specification?
 
-Refer to the BROKEN_LINK xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-2-ct-results[Apache Felix Framework OSGi R4.2 CT Results] document.
+Refer to the BROKEN_LINK xref:subprojects/apache-felix-framework/apache-felix-framework-osgi-r4-2-ct-results[Apache Felix Framework OSGi R4.2 CT Results] document.
 
 == If I use bundles from Felix, will my application be tied to the Felix framework?
 
-See the answer in the BROKEN_LINK xref:documentation/subprojects/apache-felix-framework/apache-felix-osgi-faq-felix-dependencies.adoc[OSGi FAQ].
+See the answer in the BROKEN_LINK xref:subprojects/apache-felix-framework/apache-felix-osgi-faq-felix-dependencies.adoc[OSGi FAQ].
 
 == When I update my bundle, why are my bundle's old classes still being used?
 
-See the answer in the BROKEN_LINK xref:documentation/subprojects/apache-felix-framework/apache-felix-osgi-faq-bundle-not-updated.adoc[OSGi FAQ].
+See the answer in the BROKEN_LINK xref:subprojects/apache-felix-framework/apache-felix-osgi-faq-bundle-not-updated.adoc[OSGi FAQ].
 
 == Why do I get an "Unknown protocol: http" exception when I run Felix on a non-Sun JRE?
 
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc b/modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc
similarity index 97%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc
index 377cf46..277823f 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-launching-and-embedding.adoc
@@ -78,13 +78,13 @@ It is obtained following the standard `META-INF/services` approach.
 === Creating and Configuring the Framework Instance
 
 You use the framework factory to construct and configure a framework instance (or by directly instantiating the Felix class).
-The configuration map may contain any of the framework configuration properties listed in the xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc[Apache Felix Framework Configuration Properties] document, not the launcher configuration properties.
+The configuration map may contain any of the framework configuration properties listed in the xref:subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc[Apache Felix Framework Configuration Properties] document, not the launcher configuration properties.
 The configuration map is copied and the keys are treated as case insensitive.
 You are not able to change the framework's configuration after construction.
 If you need a different configuration, you must create a new framework instance.
 
 WARNING: *WARNING* Felix configuration properties have change considerably starting from `1.4.0`;
-if you are upgrading from an earlier version, the xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc#_migrating_from_earlier_versions[configuration property document] describes the configuration property changes.
+if you are upgrading from an earlier version, the xref:subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc#_migrating_from_earlier_versions[configuration property document] describes the configuration property changes.
 
 === Starting the Framework Instance
 
@@ -128,7 +128,7 @@ Launching a framework is fairly simple and involves only four steps:
 
 In reality, the first step is optional, since all properties will have reasonable defaults, but if you are creating a launcher you will generally want to more than that, such as automatically installing and starting bundles when you start the framework instance.
 The default Felix launcher defines reusable functionality to automatically install and/or start bundles upon framework startup;
-see the xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc#_configuring_the_framework[usage document] for more information on configuring the Felix framework and on the various configuration properties.
+see the xref:subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc#_configuring_the_framework[usage document] for more information on configuring the Felix framework and on the various configuration properties.
 
 The remainder of this section describes how the standard Felix launcher works as well as how to create a custom launcher.
 
@@ -272,7 +272,7 @@ see the xref:#_custom-launcher[custom launcher example] below to see how the MET
 [cols=2*]
 |===
 | Use `org.apache.felix.main.AutoProcessor`, which will automatically deploy any bundles in the auto-deploy directory as well as bundles specified in the `felix.auto.install` and `felix.auto.start` configuration properties during framework startup to automatically install and/or start bundles;
-see the usage document for more information xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc#_configuring_the_framework[configuration properties] and [bundle auto-deploy
+see the usage document for more information xref:subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc#_configuring_the_framework[configuration properties] and [bundle auto-deploy
 | Apache Felix Framework Usage Documentation#auto-deploy].
 |===
 
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc b/modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc
similarity index 97%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc
index c95f5ce..dca5ed0 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc
@@ -63,7 +63,7 @@ The Felix framework distribution comes with three bundles, which are located in
 These bundles include the Gogo Runtime (core command processing functionality), Gogo Shell (text-based shell user interface), Gogo Command (basic set of commands), and Bundle Repository (a bundle repository service).
 In addition to these bundles, the bundle repository provides access to other bundles for easy installation.
 The bundle repository service provides a set of shell commands in the `obr:*` scope;
-refer to the xref:documentation/subprojects/apache-felix-osgi-bundle-repository.adoc[Apache Felix OSGi Bundle Repository] for more information.
+refer to the xref:subprojects/apache-felix-osgi-bundle-repository.adoc[Apache Felix OSGi Bundle Repository] for more information.
 
 Before installing any bundles, it is important to understand how bundles are manually deployed into the framework.
 Bundles are deployed in two stages;
@@ -155,7 +155,7 @@ For example:
  java -Dfelix.config.properties=file:/home/rickhall/config.properties -jar bin/felix.jar
 
 Configuration and system properties are accessible at run time via `BundleContext.getProperty()`, but configuration properties override system properties.
-For more information about available configuration properties, refer to the xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc[Apache Felix Framework Configuration Properties] document.
+For more information about available configuration properties, refer to the xref:subprojects/apache-felix-framework/apache-felix-framework-configuration-properties.adoc[Apache Felix Framework Configuration Properties] document.
 The Felix framework distribution contains a default `conf/config.properties`.
 
 === System Property Substitution
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-gogo.adoc b/modules/ROOT/pages/subprojects/apache-felix-gogo.adoc
similarity index 93%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-gogo.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-gogo.adoc
index 05dcf47..26e467e 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-gogo.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-gogo.adoc
@@ -34,7 +34,7 @@ Welcome to Apache Felix Gogo
 g!
 ----
 
-Gogo shell integration in the framework distribution is also discussed in the xref:documentation/subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc[framework usage document]
+Gogo shell integration in the framework distribution is also discussed in the xref:subprojects/apache-felix-framework/apache-felix-framework-usage-documentation.adoc[framework usage document]
 
 == Built in shell features
 
@@ -208,5 +208,5 @@ Types:
 == Origin in RFC 147
 
 Gogo is based on the OSGi RFC 147, which describes a standard shell for OSGi-based environments.
-See xref:documentation/subprojects/apache-felix-gogo/rfc-147-overview.adoc[RFC 147 Overview] for more information.
+See xref:subprojects/apache-felix-gogo/rfc-147-overview.adoc[RFC 147 Overview] for more information.
 Unfortunately this RFC was never made a standard.
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-gogo/rfc-147-overview.adoc b/modules/ROOT/pages/subprojects/apache-felix-gogo/rfc-147-overview.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-gogo/rfc-147-overview.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-gogo/rfc-147-overview.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-healthchecks.adoc b/modules/ROOT/pages/subprojects/apache-felix-healthchecks.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-healthchecks.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-healthchecks.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-inventory.adoc b/modules/ROOT/pages/subprojects/apache-felix-inventory.adoc
similarity index 96%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-inventory.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-inventory.adoc
index 85432ae..0392c4b 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-inventory.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-inventory.adoc
@@ -63,7 +63,7 @@ The first three properties are required for the Inventory Printer service to be
 Otherwise the service is ignored by the framework printing a message to the log.
 
 To prevent bundle resolution failure if the `InventoryPrinter` API is not available in the framework it is suggested to register the Inventory Printer services as service factories and dynamically import the API.
-See the question xref:documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc#how-to-provide-optional-services[{{ ref.apache-felix-osgi-faq.title }}] in the Apache Felix OSGi FAQ for more details.
+See the question xref:tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc#how-to-provide-optional-services[{{ ref.apache-felix-osgi-faq.title }}] in the Apache Felix OSGi FAQ for more details.
 
 === Example Inventory Printer Service
 
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-log.adoc b/modules/ROOT/pages/subprojects/apache-felix-log.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-log.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-log.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-logback.adoc b/modules/ROOT/pages/subprojects/apache-felix-logback.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-logback.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-logback.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.adoc b/modules/ROOT/pages/subprojects/apache-felix-maven-bundle-plugin-bnd.adoc
similarity index 99%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-maven-bundle-plugin-bnd.adoc
index 3760682..2362d7c 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-maven-bundle-plugin-bnd.adoc
@@ -6,7 +6,7 @@ The way you create a bundle with BND is to tell it the content of the bundle's J
 This plugin wraps BND to make it work specifically with the Maven 2 project structure and to provide it with reasonable default behavior for Maven 2 projects.
 
 INFO:
-If you have questions about the maven-bundle-plugin please read the xref:documentation/faqs/apache-felix-bundle-plugin-faq.adoc[FAQ] first.
+If you have questions about the maven-bundle-plugin please read the xref:faqs/apache-felix-bundle-plugin-faq.adoc[FAQ] first.
 If you still have questions you can ask them on the http://felix.apache.org/site/mailinglists.html[Felix user list].</div>
 
 _NOTE: test scoped dependencies are *not* included in the classpath seen by BND._
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.adoc b/modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.adoc b/modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-ant-task-use.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.adoc b/modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.adoc b/modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/extending-scr-annotations.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.adoc b/modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/scr-annotations.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/scr-annotations.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.adoc b/modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-maven-scr-plugin/scr-javadoc-tags.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-metatype-service.adoc b/modules/ROOT/pages/subprojects/apache-felix-metatype-service.adoc
similarity index 95%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-metatype-service.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-metatype-service.adoc
index 6fe9dba..bc9ec0a 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-metatype-service.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-metatype-service.adoc
@@ -5,7 +5,7 @@ This information can optionally be localized, thus allowing the developer to pro
 The specification defines a rich dynamic typing system to describe service attributes in a precise way, which makes it possible to dynamically create user interfaces to configure services.
 
 The simplest way to specify service metatype information is to add one or more XML files in the `OSGI-INF/metatype` folder.
-For example, the `OSGI-INF/metatype/metatype.xml` file included in the xref:documentation/subprojects/apache-felix-file-install.adoc[Apache Felix File Install] subproject is as follows:
+For example, the `OSGI-INF/metatype/metatype.xml` file included in the xref:subprojects/apache-felix-file-install.adoc[Apache Felix File Install] subproject is as follows:
 
 ----
 <?xml version="1.0" encoding="UTF-8"?>
@@ -51,7 +51,7 @@ The following types are supported by the specification:
 == Localization
 
 As mentioned before, it is possible to localize metatype information.
-A good example is the xref:documentation/subprojects/apache-felix-web-console.adoc[Apache Felix Web Console] subproject, which includes the following metatype information:
+A good example is the xref:subprojects/apache-felix-web-console.adoc[Apache Felix Web Console] subproject, which includes the following metatype information:
 
 ----
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-osgi-bundle-repository.adoc b/modules/ROOT/pages/subprojects/apache-felix-osgi-bundle-repository.adoc
similarity index 99%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-osgi-bundle-repository.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-osgi-bundle-repository.adoc
index ee1a454..e54cbb9 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-osgi-bundle-repository.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-osgi-bundle-repository.adoc
@@ -177,7 +177,7 @@ Unfortunately, this may not be the case, thus the deployment algorithm might hav
 In response to this type of scenario, the OBR deployment algorithm tries to favor updating existing bundles, if possible, as opposed to installing new bundles to satisfy dependencies.
 
 In the general case, OBR user's will not use the OBR API directly, but will use its functionality indirectly from another tool or user interface.
-For example, interactive access to OBR is available via a command for Felix' xref:documentation/subprojects/apache-felix-shell.adoc[shell service].
+For example, interactive access to OBR is available via a command for Felix' xref:subprojects/apache-felix-shell.adoc[shell service].
 The OBR shell command is discussed in the next section.
 
 == OBR Shell Command
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-preferences-service.adoc b/modules/ROOT/pages/subprojects/apache-felix-preferences-service.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-preferences-service.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-preferences-service.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-remote-shell.adoc b/modules/ROOT/pages/subprojects/apache-felix-remote-shell.adoc
similarity index 93%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-remote-shell.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-remote-shell.adoc
index c7cd909..0acac26 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-remote-shell.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-remote-shell.adoc
@@ -1,6 +1,6 @@
 = Apache Felix Remote Shell
 
-The Apache Felix Remote Shell provided by the `org.apache.felix.shell.remote` bundle offers remote access to xref:documentation/subprojects/apache-felix-shell.adoc[Apache Felix Shell] and [Apache Felix Gogo] using telnet clients.
+The Apache Felix Remote Shell provided by the `org.apache.felix.shell.remote` bundle offers remote access to xref:subprojects/apache-felix-shell.adoc[Apache Felix Shell] and [Apache Felix Gogo] using telnet clients.
 The remote shell provides simple telnet access with no bells and whistles -- it just works.
 
 To use remote shell with the Felix shell, you have to install the `org.apache.felix.shell` bundle in addition to the `org.apache.felix.shell.remote` bundle.
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-shell-tui.adoc b/modules/ROOT/pages/subprojects/apache-felix-shell-tui.adoc
similarity index 88%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-shell-tui.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-shell-tui.adoc
index 2550ae4..9a4e5dd 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-shell-tui.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-shell-tui.adoc
@@ -1,6 +1,6 @@
 = Apache Felix Shell TUI
 
-The Apache Felix Shell TUI (Textual User Interface) sub-project provides a simple, text-based user interface for the xref:documentation/subprojects/apache-felix-shell.adoc[Apache Felix Shell].
+The Apache Felix Shell TUI (Textual User Interface) sub-project provides a simple, text-based user interface for the xref:subprojects/apache-felix-shell.adoc[Apache Felix Shell].
 This bundle is not of much use by itself and should always be used in conjunction with the shell service bundle.
 The shell service and shell TUI bundles are used by the standard Felix launcher to provide a means for interacting with the launched Felix framework instance.
 The shell TUI bundle is not required to use the shell service;
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-shell.adoc b/modules/ROOT/pages/subprojects/apache-felix-shell.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-shell.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-shell.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console.adoc b/modules/ROOT/pages/subprojects/apache-felix-web-console.adoc
similarity index 97%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-web-console.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-web-console.adoc
index 23c0815..94618d5 100644
--- a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console.adoc
+++ b/modules/ROOT/pages/subprojects/apache-felix-web-console.adoc
@@ -157,7 +157,7 @@ Such framework properties will also be considered actual default values for miss
 |===
 
 Please note that setting any of these properties as framework property makes them visible to all bundles deployed.
-This is particularly to be considered in case of the `felix.webconsole.password` property (as for authentication, the use of a xref:documentation/subprojects/apache-felix-web-console/web-console-security-provider.adoc[Web Console Security Provider] is suggested anyway).
+This is particularly to be considered in case of the `felix.webconsole.password` property (as for authentication, the use of a xref:subprojects/apache-felix-web-console/web-console-security-provider.adoc[Web Console Security Provider] is suggested anyway).
 
 [discrete]
 ==== Configuration of the OSGi Http Service
@@ -224,7 +224,7 @@ This should also help in keeping browser support on the broadest possible basis.
 The Web Console can be extended by registering an OSGi service for the interface `javax.servlet.Servlet` with the service property `felix.webconsole.label` set to the label (last segment in the URL) of the page.
 The respective service is called a Web Console Plugin or a plugin for short.
 
-Please for to the xref:documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc[Extending the Apache Felix Web Console] for full documentation on extending the Apache Felix Web Console.
+Please for to the xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc[Extending the Apache Felix Web Console] for full documentation on extending the Apache Felix Web Console.
 
 == RESTful API
 
diff --git a/modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc b/modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc
new file mode 100644
index 0000000..a9916b3
--- /dev/null
+++ b/modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console.adoc
@@ -0,0 +1,10 @@
+= Extending the Apache Felix Web Console
+
+The xref:subprojects/apache-felix-web-console.adoc[Apache Felix Web Console] is extensible in various ways described no these pages:
+
+* xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc[Providing Web Console Plugins]
+* xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc[Providing Resources]
+* xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc[Branding the Web Console]
+* xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc[Web Console Output Templating]
+* xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc[Web Console Logging]
+* xref:subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-security-provider.adoc[Web Console Security Provider]
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc b/modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/branding-the-web-console.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc b/modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-resources.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc b/modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/providing-web-console-plugins.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc b/modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-logging.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc b/modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-web-console/extending-the-apache-felix-web-console/web-console-output-templating.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/web-console-restful-api.adoc b/modules/ROOT/pages/subprojects/apache-felix-web-console/web-console-restful-api.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/web-console-restful-api.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-web-console/web-console-restful-api.adoc
diff --git a/modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/web-console-security-provider.adoc b/modules/ROOT/pages/subprojects/apache-felix-web-console/web-console-security-provider.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/subprojects/apache-felix-web-console/web-console-security-provider.adoc
rename to modules/ROOT/pages/subprojects/apache-felix-web-console/web-console-security-provider.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-application-demonstration.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-application-demonstration.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-application-demonstration.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-application-demonstration.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc
similarity index 98%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc
index b479e55..a5ef4d5 100644
--- a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc
+++ b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-faq.adoc
@@ -102,7 +102,7 @@ To increase the complexity lets assume the API for the optional service may not
 So assuming there is no service consumer, the bundle should not fail to start if the API is not available.
 
 Lets illustrate with a concrete example: Consider a bundle executes some business logic.
-Optionally the bundle provides information through the xref:documentation/subprojects/apache-felix-web-console.adoc[Apache Felix Web Console].
+Optionally the bundle provides information through the xref:subprojects/apache-felix-web-console.adoc[Apache Felix Web Console].
 The bundle should resolve and be active regardless of whether the web console is present or not.
 
 The OSGi Core specification has two helpful mechanism at hand for these situations: `ServiceFactory` and `DynamicImport-Package`.
diff --git a/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc
new file mode 100644
index 0000000..fff4450
--- /dev/null
+++ b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial.adoc
@@ -0,0 +1,16 @@
+= Apache Felix OSGi Tutorial
+
+This tutorial creates successively more complex OSGi bundles to illustrate most of the features and functionality offered by the OSGi framework.
+
+Trails:
+
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc[Apache Felix Tutorial Example 1]: A bundle that listens for OSGi service events.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc[Apache Felix Tutorial Example 2]: A bundle that implements a dictionary service.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc[Apache Felix Tutorial Example 2b]: A bundle that implements another dictionary service.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc[Apache Felix Tutorial Example 3]: A bundle that implements a simple dictionary service client.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc[Apache Felix Tutorial Example 4]: A bundle that implements a more robust dictionary service client.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc[Apache Felix Tutorial Example 5]: A bundle that implements a dictionary service client using the Service Tracker.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc[Apache Felix Tutorial Example 6]: A bundle that implements a spell checker service using dictionary services.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc[Apache Felix Tutorial Example 7]: A bundle that implements a spell checker service client.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc[Apache Felix Tutorial Example 8]: A bundle that implements a spell checker service using Service Binder.
+* xref:tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc[Apache Felix Tutorial Example 9]: A bundle that implements a spell checker service using Declarative Services.
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-1.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-2b.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-3.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-4.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-5.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-6.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-7.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-8.adoc
diff --git a/modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc b/modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc
similarity index 100%
rename from modules/ROOT/pages/documentation/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc
rename to modules/ROOT/pages/tutorials-examples-and-presentations/apache-felix-osgi-tutorial/apache-felix-tutorial-example-9.adoc