diff --git a/docs/installation-and-operations/system-requirements/README.md b/docs/installation-and-operations/system-requirements/README.md
index d8fe1639098..a765d030626 100644
--- a/docs/installation-and-operations/system-requirements/README.md
+++ b/docs/installation-and-operations/system-requirements/README.md
@@ -24,7 +24,7 @@ This is for a single server running OpenProject for up to 200 total users. Depen
 
 ## Database
 
-OpenProject officially supports [PostgreSQL version 16](https://www.postgresql.org/) or above since [OpenProject 16.0.0](https://www.openproject.org/docs/release-notes/16-0-0/).
+OpenProject officially supports [PostgreSQL version 16](https://www.postgresql.org/) or above since [OpenProject 16.0.0](../../release-notes/16/16-0-0/).
 
 PostgreSQL versions 13 - 15 are not officially supported, but MAY continue to work, but could result in incompatibilities and degraded performance in the future. If you are using one of these versions currently, we have a [migration guide on how to upgrade to PostgreSQL 17](../misc/migration-to-postgresql17/) and strongly recommend you to upgrade your DBMS, as there are significant performance improvements.
 
diff --git a/docs/release-notes/16-0-0/README.md b/docs/release-notes/16/16-0-0/README.md
similarity index 92%
rename from docs/release-notes/16-0-0/README.md
rename to docs/release-notes/16/16-0-0/README.md
index a2f30fedcc1..b46ea241fef 100644
--- a/docs/release-notes/16-0-0/README.md
+++ b/docs/release-notes/16/16-0-0/README.md
@@ -32,11 +32,11 @@ Take a look at our release video showing the most important features introduced
 
 Meeting organization becomes even easier with OpenProject 16.0: Meeting backlogs allow users to collect, manage, and prepare agenda items more flexibly — both for one-time meetings and for recurring meeting series.
 
-In one-time meetings, the new [**Agenda backlog**](../../user-guide/meetings/one-time-meetings/#agenda-backlogs) stores topics that are not yet assigned to the current meeting but may be added later.
+In one-time meetings, the new [**Agenda backlog**](../../../user-guide/meetings/one-time-meetings/#agenda-backlogs) stores topics that are not yet assigned to the current meeting but may be added later.
 
 ![A one-time meeting in OpenProject with an Agenda backlog and info to 'Drag items here or create a new one'.](openproject-16-0-meeting-backlogs-one-time-highlighted.png)
 
-In recurring meetings, the shared [**Series backlog**](../../user-guide/meetings/recurring-meetings/#meeting-backlogs-for-recurring-meetings) helps track open points across all meeting occurrences and move items between them as priorities change.
+In recurring meetings, the shared [**Series backlog**](../../../user-guide/meetings/recurring-meetings/#meeting-backlogs-for-recurring-meetings) helps track open points across all meeting occurrences and move items between them as priorities change.
 
 ![A recurring meeting in OpenProject with a Series backlog and and options to Edit, add notes, Move to current meeting or Remove from agenda.](openproject-16-0-meeting-backlogs-recurring-options.png)
 
@@ -64,7 +64,7 @@ All users with these permissions then see an "Internal comment" checkbox when ad
 > [!NOTE]
 > Starting with 16.0, **files uploaded in the Activity tab will not be included in the Files tab**. Even though internal comments are the technical trigger for this change, it applies to both regular and internal comments.
 
-Find out more about [internal comments in this user guide](../../user-guide/activity/#internal-comments-enterprise-add-on) and [this blog article](https://www.openproject.org/blog/internal-comments/).
+Find out more about [internal comments in this user guide](../../../user-guide/activity/#internal-comments-enterprise-add-on) and [this blog article](https://www.openproject.org/blog/internal-comments/).
 
 ## Automatically generated work package subjects (Enterprise add-on)
 
@@ -74,11 +74,11 @@ OpenProject now supports automatically generated subjects for work packages. Thi
 
 This is especially useful for structured processes such as vacation requests, IT tickets, or maintenance reports, where consistent naming is required. Subject patterns can include static text as well as dynamic placeholders like project name, work package type, or custom field values.
 
-Get an [introduction in the user guide](../../user-guide/work-packages/automatic-subjects/), learn more about [configuring automatically generated work package subjects in OpenProject system administration guide](../../system-admin-guide/manage-work-packages/work-package-types/automatic-subjects/), or consult this [blog article](https://www.openproject.org/blog/automatically-generated-work-package-subjects/) for more use case examples. 
+Get an [introduction in the user guide](../../../user-guide/work-packages/automatic-subjects/), learn more about [configuring automatically generated work package subjects in OpenProject system administration guide](../../../system-admin-guide/manage-work-packages/work-package-types/automatic-subjects/), or consult this [blog article](https://www.openproject.org/blog/automatically-generated-work-package-subjects/) for more use case examples. 
 
 ## Separate time tracking module with calendar view
 
-OpenProject 16.0 offers a separate time tracking module with a calendar view. It is accessible from the global view and listed in the left side bar navigation called [My time tracking](../../user-guide/time-and-costs/my-time-tracking/). There, users can view and edit their logged time with start and end times. Users can switch between daily, weekly, work week and monthly views and also log new time entries directly by clicking in the calendar.
+OpenProject 16.0 offers a separate time tracking module with a calendar view. It is accessible from the global view and listed in the left side bar navigation called [My time tracking](../../../user-guide/time-and-costs/my-time-tracking/). There, users can view and edit their logged time with start and end times. Users can switch between daily, weekly, work week and monthly views and also log new time entries directly by clicking in the calendar.
 
 Each day shows the sum of the tracked time, and in the weekly and monthly views, the total tracked time is displayed in the lower right corner.
 
@@ -86,7 +86,7 @@ Each day shows the sum of the tracked time, and in the weekly and monthly views,
 
 Please note that this module has to be activated by an administrator first. Navigate to *Administration → Time and costs → Defaults* and check the box next to 'Allow exact time tracking' to enable tracking start and finish dates. If 'Allow exact time tracking' is enabled, the calendar becomes the default view for the My time tracking module. If 'Require exact times' is checked, users must provide both start and end times when logging time. Otherwise, the list view remains the default. In the calendar view, all entries are then displayed at the top of the respective day column.
 
-Learn more about My time tracking module in [this user guide](../../user-guide/time-and-costs/my-time-tracking/) and [this blog article](https://www.openproject.org/blog/time-tracking-module/).
+Learn more about My time tracking module in [this user guide](../../../user-guide/time-and-costs/my-time-tracking/) and [this blog article](https://www.openproject.org/blog/time-tracking-module/).
 
 ### Time entries with legally required mandatory fields: start time and finish time
 
@@ -104,7 +104,7 @@ From time to time an Enterprise add-on is released for the free Community versio
 
 The work package graph widgets display information about the work packages within a project and can be shown in different views, such as bar graphs or pie charts.
 
-[Learn more about this feature in our user guide](../../user-guide/project-home/project-widgets/#work-package-graph-widgets).
+[Learn more about this feature in our user guide](../../../user-guide/project-home/project-widgets/#work-package-graph-widgets).
 
 ![Different graphs displayed on a project overview page in OpenProject: Work package status in a pie chart, work packages progress in a graph with percentages, closed + open work packages sorted by type and number of assignees.](openproject-project-reports.png)
 
@@ -116,7 +116,7 @@ As requested by our users, you can now add a parent work package relation by cho
 
 ## Save work package export configuration
 
-When [exporting a (public or private) work package table](../../user-guide/work-packages/exporting/), users can now save their configuration settings, e.g. a specific order and display of columns or long text fields. This saves time and allows users to share the export settings with their team (e.g. for a defects and approval report). Please note that this setting is not individual and will **change the default configuration for this specific format and type for everyone**.
+When [exporting a (public or private) work package table](../../../user-guide/work-packages/exporting/), users can now save their configuration settings, e.g. a specific order and display of columns or long text fields. This saves time and allows users to share the export settings with their team (e.g. for a defects and approval report). Please note that this setting is not individual and will **change the default configuration for this specific format and type for everyone**.
 
 ![OpenProject work package table export modal with a highlighted checkbox to save settings.](openproject-16-0-save-export-settings-highlighted.png)
 
@@ -140,7 +140,7 @@ OpenProject 16.0 introduces a major improvement for customers of the Enterprise
 
 Instead of mutually acting as OAuth servers and clients, both OpenProject and Nextcloud can now authenticate against a common Identity Provider (IDP). This allows OpenProject to reuse the user session to call Nextcloud APIs directly — improving the user experience and reducing complexity in daily workflows.
 
-Please see [our system admin guide](../../system-admin-guide/integrations/nextcloud/oidc-sso/) to learn how to set up this integration.
+Please see [our system admin guide](../../../system-admin-guide/integrations/nextcloud/oidc-sso/) to learn how to set up this integration.
 
 This is the first version of OpenProject to support this new integration method with Nextcloud. Since this feature was not yet
 exposed to large installations, we still consider it experimental. Please share your feedback regarding this new feature with us and stay tuned
@@ -148,7 +148,7 @@ for further enhancements around it.
 
 ## Breaking: API requests with JWT issued by OpenID Connect provider require scope
 
-In [OpenProject 14.4.0](../../release-notes/14/14-0-0/) we introduced the possibility to access the OpenProject API through a JSON Web Token created by an OpenID Connect
+In [OpenProject 14.4.0](../../../release-notes/14/14-0-0/) we introduced the possibility to access the OpenProject API through a JSON Web Token created by an OpenID Connect
 provider. Back then we only intended them to be used in the context of our APIv3. However, as OpenProject evolves further, we want to
 be able to use them in additional contexts. Starting with OpenProject 16.0.0, we will therefore require all tokens to carry a scope called
 `api_v3` for API requests to our APIv3. This is consistent with other tokens issued by OpenProject itself.
@@ -300,4 +300,4 @@ Last but not least, we are very grateful for our very engaged translation contri
 - [Gzyyy](https://crowdin.com/profile/gzyyy), for a great number of translations into Chinese simplified.
 - [rlmpereira](https://crowdin.com/profile/rlmpereira), for a great number of translations into Portuguese.
 
-Would you like to help out with translations yourself? Then take a look at our [translation guide](../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
+Would you like to help out with translations yourself? Then take a look at our [translation guide](../../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
diff --git a/docs/release-notes/16-0-0/openproject-16-0-automatically-generated-work-package-subjects-candidate-interview-explained.png b/docs/release-notes/16/16-0-0/openproject-16-0-automatically-generated-work-package-subjects-candidate-interview-explained.png
similarity index 100%
rename from docs/release-notes/16-0-0/openproject-16-0-automatically-generated-work-package-subjects-candidate-interview-explained.png
rename to docs/release-notes/16/16-0-0/openproject-16-0-automatically-generated-work-package-subjects-candidate-interview-explained.png
diff --git a/docs/release-notes/16-0-0/openproject-16-0-internal-comment.png b/docs/release-notes/16/16-0-0/openproject-16-0-internal-comment.png
similarity index 100%
rename from docs/release-notes/16-0-0/openproject-16-0-internal-comment.png
rename to docs/release-notes/16/16-0-0/openproject-16-0-internal-comment.png
diff --git a/docs/release-notes/16-0-0/openproject-16-0-meeting-backlogs-one-time-highlighted.png b/docs/release-notes/16/16-0-0/openproject-16-0-meeting-backlogs-one-time-highlighted.png
similarity index 100%
rename from docs/release-notes/16-0-0/openproject-16-0-meeting-backlogs-one-time-highlighted.png
rename to docs/release-notes/16/16-0-0/openproject-16-0-meeting-backlogs-one-time-highlighted.png
diff --git a/docs/release-notes/16-0-0/openproject-16-0-meeting-backlogs-recurring-options.png b/docs/release-notes/16/16-0-0/openproject-16-0-meeting-backlogs-recurring-options.png
similarity index 100%
rename from docs/release-notes/16-0-0/openproject-16-0-meeting-backlogs-recurring-options.png
rename to docs/release-notes/16/16-0-0/openproject-16-0-meeting-backlogs-recurring-options.png
diff --git a/docs/release-notes/16-0-0/openproject-16-0-my-time-tracking-work-week-final.png b/docs/release-notes/16/16-0-0/openproject-16-0-my-time-tracking-work-week-final.png
similarity index 100%
rename from docs/release-notes/16-0-0/openproject-16-0-my-time-tracking-work-week-final.png
rename to docs/release-notes/16/16-0-0/openproject-16-0-my-time-tracking-work-week-final.png
diff --git a/docs/release-notes/16-0-0/openproject-16-0-parent-relation.png b/docs/release-notes/16/16-0-0/openproject-16-0-parent-relation.png
similarity index 100%
rename from docs/release-notes/16-0-0/openproject-16-0-parent-relation.png
rename to docs/release-notes/16/16-0-0/openproject-16-0-parent-relation.png
diff --git a/docs/release-notes/16-0-0/openproject-16-0-save-export-settings-highlighted.png b/docs/release-notes/16/16-0-0/openproject-16-0-save-export-settings-highlighted.png
similarity index 100%
rename from docs/release-notes/16-0-0/openproject-16-0-save-export-settings-highlighted.png
rename to docs/release-notes/16/16-0-0/openproject-16-0-save-export-settings-highlighted.png
diff --git a/docs/release-notes/16-0-0/openproject-16-0-timesheet-hours-user-day.png b/docs/release-notes/16/16-0-0/openproject-16-0-timesheet-hours-user-day.png
similarity index 100%
rename from docs/release-notes/16-0-0/openproject-16-0-timesheet-hours-user-day.png
rename to docs/release-notes/16/16-0-0/openproject-16-0-timesheet-hours-user-day.png
diff --git a/docs/release-notes/16-0-0/openproject-project-reports.png b/docs/release-notes/16/16-0-0/openproject-project-reports.png
similarity index 100%
rename from docs/release-notes/16-0-0/openproject-project-reports.png
rename to docs/release-notes/16/16-0-0/openproject-project-reports.png
diff --git a/docs/release-notes/16-0-1/README.md b/docs/release-notes/16/16-0-1/README.md
similarity index 100%
rename from docs/release-notes/16-0-1/README.md
rename to docs/release-notes/16/16-0-1/README.md
diff --git a/docs/release-notes/16-1-0/README.md b/docs/release-notes/16/16-1-0/README.md
similarity index 97%
rename from docs/release-notes/16-1-0/README.md
rename to docs/release-notes/16/16-1-0/README.md
index 9a3cf22caa5..86d42ca335d 100644
--- a/docs/release-notes/16-1-0/README.md
+++ b/docs/release-notes/16/16-1-0/README.md
@@ -33,7 +33,7 @@ You’ll find the full life cycle directly in the project overview page, where y
 > [!NOTE]
 > With the Enterprise add-on available in the Premium plan or higher, you can configure existing project phases and phase gates and even create new ones. This is done in the global settings. The project-level features are available in all editions, with pre-defined phases based on the [open source PM² framework](https://www.openproject.org/pm2/).
 
-[Read more about working with a project life cycle in OpenProject](../../system-admin-guide/projects/project-life-cycle/).
+[Read more about working with a project life cycle in OpenProject](../../../system-admin-guide/projects/project-life-cycle/).
 
 ### Export meetings in PDF format
 
@@ -51,7 +51,7 @@ The export is available via the More (⋯) menu for both one-time meetings and i
 
 The PDF is generated in A4 format and includes a clearly structured layout. 
 
-[Learn more about exporting meetings in PDF format in our documentation](../../user-guide/meetings/one-time-meetings/#export-a-meeting).
+[Learn more about exporting meetings in PDF format in our documentation](../../../user-guide/meetings/one-time-meetings/#export-a-meeting).
 
 ![Overlay of Export PDF options for OpenProject meetings](openproject-16-1-export-meeting-to-pdf.png)
 
@@ -69,7 +69,7 @@ To make setting reminders even quicker, OpenProject now offers pre-filled option
 
 Selecting one of the quick options will open the reminder dialog with a pre-filled date and time – typically at 9:00 local time on the selected future day. You can still adjust the date, time, and add a note before saving the reminder.
 
-[Learn more about work package reminders in our documentation](../../user-guide/work-packages/edit-work-package/#work-package-reminders).
+[Learn more about work package reminders in our documentation](../../../user-guide/work-packages/edit-work-package/#work-package-reminders).
 
 ![Dropdown menu on a work package when clicking on the reminder icon, with options to quickly choose a date to be reminded](openproject-16-1-reminder-options.png)
 
@@ -92,7 +92,7 @@ Please note that negative lags can be counterintuitive:
 > [!NOTE]
 > **Only working days** are taken into account. For example: If work package A finishes on a Tuesday and Saturday/Sunday are non-working days, then a lag of -3 will schedule its successor (work package B) to start on the previous Friday.
 
-[Learn more about work package relations in our documentation](../../user-guide/work-packages/work-package-relations-hierarchies/#work-package-relations).
+[Learn more about work package relations in our documentation](../../../user-guide/work-packages/work-package-relations-hierarchies/#work-package-relations).
 
 ### Display hierarchy trees for hierarchy custom fields (Enterprise add-on)
 
@@ -102,7 +102,7 @@ This tree helps you understand the position of the current item in the overall h
 
 Clicking on any entry in the tree opens that item in the same view, making it easy to move through even complex hierarchies without losing context.
 
-[Learn more about custom fields in our system admin guide](../../system-admin-guide/custom-fields/).
+[Learn more about custom fields in our system admin guide](../../../system-admin-guide/custom-fields/).
 
 ![Example of a hierarchy custom field with the new visualization, the hierarchical tree](openproject-hierarchy-custom-field-tree.png)
 
@@ -220,4 +220,4 @@ Last but not least, we are very grateful for our very engaged translation contri
 - [rmiyata](https://crowdin.com/profile/rmiyata), for a great number of translations into Japanese.
 - [William](https://crowdin.com/profile/williamfromtw), for a great number of translations into Chinese Traditional.
 
-Would you like to help out with translations yourself? Then take a look at our [translation guide](../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
+Would you like to help out with translations yourself? Then take a look at our [translation guide](../../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
diff --git a/docs/release-notes/16-1-0/openproject-16-1-export-meeting-to-pdf.png b/docs/release-notes/16/16-1-0/openproject-16-1-export-meeting-to-pdf.png
similarity index 100%
rename from docs/release-notes/16-1-0/openproject-16-1-export-meeting-to-pdf.png
rename to docs/release-notes/16/16-1-0/openproject-16-1-export-meeting-to-pdf.png
diff --git a/docs/release-notes/16-1-0/openproject-16-1-negative-lag.png b/docs/release-notes/16/16-1-0/openproject-16-1-negative-lag.png
similarity index 100%
rename from docs/release-notes/16-1-0/openproject-16-1-negative-lag.png
rename to docs/release-notes/16/16-1-0/openproject-16-1-negative-lag.png
diff --git a/docs/release-notes/16-1-0/openproject-16-1-project-life-cycle-project-overview-highlighted.png b/docs/release-notes/16/16-1-0/openproject-16-1-project-life-cycle-project-overview-highlighted.png
similarity index 100%
rename from docs/release-notes/16-1-0/openproject-16-1-project-life-cycle-project-overview-highlighted.png
rename to docs/release-notes/16/16-1-0/openproject-16-1-project-life-cycle-project-overview-highlighted.png
diff --git a/docs/release-notes/16-1-0/openproject-16-1-reminder-options.png b/docs/release-notes/16/16-1-0/openproject-16-1-reminder-options.png
similarity index 100%
rename from docs/release-notes/16-1-0/openproject-16-1-reminder-options.png
rename to docs/release-notes/16/16-1-0/openproject-16-1-reminder-options.png
diff --git a/docs/release-notes/16-1-0/openproject-hierarchy-custom-field-tree.png b/docs/release-notes/16/16-1-0/openproject-hierarchy-custom-field-tree.png
similarity index 100%
rename from docs/release-notes/16-1-0/openproject-hierarchy-custom-field-tree.png
rename to docs/release-notes/16/16-1-0/openproject-hierarchy-custom-field-tree.png
diff --git a/docs/release-notes/16-1-1/README.md b/docs/release-notes/16/16-1-1/README.md
similarity index 100%
rename from docs/release-notes/16-1-1/README.md
rename to docs/release-notes/16/16-1-1/README.md
diff --git a/docs/release-notes/16-2-0/README.md b/docs/release-notes/16/16-2-0/README.md
similarity index 94%
rename from docs/release-notes/16-2-0/README.md
rename to docs/release-notes/16/16-2-0/README.md
index 97e6a5f93f4..9355fcbea59 100644
--- a/docs/release-notes/16-2-0/README.md
+++ b/docs/release-notes/16/16-2-0/README.md
@@ -28,7 +28,7 @@ Please note that if you have customized the sidebar colors, your individual sett
 
 ### Primer design system added to project create and project copy forms
 
-The forms for [creating and copying projects](../../getting-started/projects/#create-a-new-project) now use the [Primer design system](https://www.openproject.org/blog/primer-design-system/), providing a cleaner and more consistent interface. This improves accessibility and ensures the process remains just as familiar.
+The forms for [creating and copying projects](../../../getting-started/projects/#create-a-new-project) now use the [Primer design system](https://www.openproject.org/blog/primer-design-system/), providing a cleaner and more consistent interface. This improves accessibility and ensures the process remains just as familiar.
 
 If you **copy** a project or create a project **based on a template**, you will immediately be able to choose which modules and parts you want to copy and which to skip. Also, the option to activate sending email notifications during the project copy is much more visible. Before 16.2, you had to click on Copy Options to unfold.
 
@@ -38,7 +38,7 @@ If you **copy** a project or create a project **based on a template**, you will
 
 PDF work package exports in OpenProject now support **non-Latin characters and emojis**. This means that project information written in scripts such as Chinese, Arabic, Cyrillic, or accented characters — as well as any emojis you use in work packages, meetings, or descriptions — will display correctly in exported PDF files. This ensures that documents generated from OpenProject reflect your content accurately, no matter which language or symbols you use.
 
-[Read more about work package PDF exports with OpenProject](../../user-guide/work-packages/exporting/)
+[Read more about work package PDF exports with OpenProject](../../../user-guide/work-packages/exporting/)
 
 ![PDF export extract from an OpenProject work package that contains emojis, symbols and non-Latin characters](openproject-16-2-pdf-export.png)
 
@@ -50,13 +50,13 @@ The + Relation menu has been reorganized with a new two-level structure, making
 
 ![OpenProject work package Relations tab when clicking on +Relation, showing some relations unfolded under 'Other relations'](openproject-user-guide-relations-second-level-navigation.png)
 
-[Read more about relations in OpenProject](../../user-guide/work-packages/work-package-relations-hierarchies/).
+[Read more about relations in OpenProject](../../../user-guide/work-packages/work-package-relations-hierarchies/).
 
 ### Select formats for custom fields and project attributes earlier in creation process
 
 When creating a new custom field, you can now select the format — such as text, list, or date — right at the beginning, on the index page of custom fields and project attributes. The same applies to project attributes. This streamlines the creation process and avoids unnecessary steps, since each type opens directly in the appropriate form. This improvement is especially helpful for administrators who frequently set up new custom fields or project attributes.
 
-Read more about how to manage [custom fields](../../system-admin-guide/custom-fields/) and [project attributes](../../user-guide/projects/project-settings/project-attributes/) in OpenProject.
+Read more about how to manage [custom fields](../../../system-admin-guide/custom-fields/) and [project attributes](../../../user-guide/projects/project-settings/project-attributes/) in OpenProject.
 
 ![OpenProject administration to add a new custom field: Dropdown lets you choose the type during the first step](openproject-16-2-custom-field-type.png)
 
@@ -65,11 +65,11 @@ Read more about how to manage [custom fields](../../system-admin-guide/custom-fi
 In the **My time tracking** module, the week and work week views now automatically collapse future and past days while keeping today expanded. This helps you focus on logging time for the current and past days without being distracted by empty future slots. If you view a past week, all days are expanded as before.
 
 > [!TIP]
-> Don't know the My time tracking module yet? We released it with [OpenProject 16.0.0](../../release-notes/16-0-0/). This module shows individual time entries in a calendar or list view, and is very helpful if you use start and end times for your time tracking. 
+> Don't know the My time tracking module yet? We released it with [OpenProject 16.0.0](../16-0-0/). This module shows individual time entries in a calendar or list view, and is very helpful if you use start and end times for your time tracking. 
 
 ![OpenProject's My time tracking module in list view, only Today expanded](user-guide-my-time-tracking-module-list-view.png)
 
-[Learn more about the My time tracking module in our documentation](../../user-guide/time-and-costs/my-time-tracking/).
+[Learn more about the My time tracking module in our documentation](../../../user-guide/time-and-costs/my-time-tracking/).
 
 ### Option to disable keyboard shortcuts for better accessibility
 
@@ -83,7 +83,7 @@ When you set a reminder for a work package, OpenProject now confirms this with a
 
 ![User information that appears when setting a reminder: Reminder set successfully. You will receive a notification for this work package tomorrow.](openproject-16-2-reminder.png)
 
-[Learn more about work package reminders in OpenProject](../../user-guide/work-packages/edit-work-package/#work-package-reminders).
+[Learn more about work package reminders in OpenProject](../../../user-guide/work-packages/edit-work-package/#work-package-reminders).
 
 ## Important technical changes
 
@@ -93,7 +93,7 @@ OpenProject 16.2 adds a **SCIM server API**, available as an Enterprise add-on i
 
 ![OpenProject administration with option to add a new SCIM client](openproject-16-2-scim-api.png)
 
-[Learn more about authentication methods with OpenProject](../../system-admin-guide/authentication/).
+[Learn more about authentication methods with OpenProject](../../../system-admin-guide/authentication/).
 
 ### API support for internal comments
 
@@ -101,7 +101,7 @@ The API has been extended to fully support **internal comments on work packages*
 
 ### Commenting on work packages fires a webhook
 
-When a comment is added to a work package, it now triggers a webhook. This enables external systems to react in real time to comments in OpenProject, for example by updating dashboards or notifying integrated tools. [See our system admin guide to learn more about webhooks for OpenProject](../../system-admin-guide/api-and-webhooks/#webhooks).
+When a comment is added to a work package, it now triggers a webhook. This enables external systems to react in real time to comments in OpenProject, for example by updating dashboards or notifying integrated tools. [See our system admin guide to learn more about webhooks for OpenProject](../../../system-admin-guide/api-and-webhooks/#webhooks).
 
 <!--more-->
 
@@ -226,4 +226,4 @@ Last but not least, we are very grateful for our very engaged translation contri
 - [rmiyata](https://crowdin.com/profile/rmiyata), for a great number of translations into Japanese.
 - [rubenpedrolopez](https://crowdin.com/profile/rubenpedrolopez), for a great number of translations into Spanish.
 
-Would you like to help out with translations yourself? Then take a look at our [translation guide](../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
+Would you like to help out with translations yourself? Then take a look at our [translation guide](../../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
diff --git a/docs/release-notes/16-2-0/openproject-16-2-create-project.png b/docs/release-notes/16/16-2-0/openproject-16-2-create-project.png
similarity index 100%
rename from docs/release-notes/16-2-0/openproject-16-2-create-project.png
rename to docs/release-notes/16/16-2-0/openproject-16-2-create-project.png
diff --git a/docs/release-notes/16-2-0/openproject-16-2-custom-field-type.png b/docs/release-notes/16/16-2-0/openproject-16-2-custom-field-type.png
similarity index 100%
rename from docs/release-notes/16-2-0/openproject-16-2-custom-field-type.png
rename to docs/release-notes/16/16-2-0/openproject-16-2-custom-field-type.png
diff --git a/docs/release-notes/16-2-0/openproject-16-2-design-updates.png b/docs/release-notes/16/16-2-0/openproject-16-2-design-updates.png
similarity index 100%
rename from docs/release-notes/16-2-0/openproject-16-2-design-updates.png
rename to docs/release-notes/16/16-2-0/openproject-16-2-design-updates.png
diff --git a/docs/release-notes/16-2-0/openproject-16-2-pdf-export.png b/docs/release-notes/16/16-2-0/openproject-16-2-pdf-export.png
similarity index 100%
rename from docs/release-notes/16-2-0/openproject-16-2-pdf-export.png
rename to docs/release-notes/16/16-2-0/openproject-16-2-pdf-export.png
diff --git a/docs/release-notes/16-2-0/openproject-16-2-reminder.png b/docs/release-notes/16/16-2-0/openproject-16-2-reminder.png
similarity index 100%
rename from docs/release-notes/16-2-0/openproject-16-2-reminder.png
rename to docs/release-notes/16/16-2-0/openproject-16-2-reminder.png
diff --git a/docs/release-notes/16-2-0/openproject-16-2-scim-api.png b/docs/release-notes/16/16-2-0/openproject-16-2-scim-api.png
similarity index 100%
rename from docs/release-notes/16-2-0/openproject-16-2-scim-api.png
rename to docs/release-notes/16/16-2-0/openproject-16-2-scim-api.png
diff --git a/docs/release-notes/16-2-0/openproject-user-guide-account-settings-interface.png b/docs/release-notes/16/16-2-0/openproject-user-guide-account-settings-interface.png
similarity index 100%
rename from docs/release-notes/16-2-0/openproject-user-guide-account-settings-interface.png
rename to docs/release-notes/16/16-2-0/openproject-user-guide-account-settings-interface.png
diff --git a/docs/release-notes/16-2-0/openproject-user-guide-relations-second-level-navigation.png b/docs/release-notes/16/16-2-0/openproject-user-guide-relations-second-level-navigation.png
similarity index 100%
rename from docs/release-notes/16-2-0/openproject-user-guide-relations-second-level-navigation.png
rename to docs/release-notes/16/16-2-0/openproject-user-guide-relations-second-level-navigation.png
diff --git a/docs/release-notes/16-2-0/user-guide-my-time-tracking-module-list-view.png b/docs/release-notes/16/16-2-0/user-guide-my-time-tracking-module-list-view.png
similarity index 100%
rename from docs/release-notes/16-2-0/user-guide-my-time-tracking-module-list-view.png
rename to docs/release-notes/16/16-2-0/user-guide-my-time-tracking-module-list-view.png
diff --git a/docs/release-notes/16-2-1/README.md b/docs/release-notes/16/16-2-1/README.md
similarity index 100%
rename from docs/release-notes/16-2-1/README.md
rename to docs/release-notes/16/16-2-1/README.md
diff --git a/docs/release-notes/16-2-2/README.md b/docs/release-notes/16/16-2-2/README.md
similarity index 100%
rename from docs/release-notes/16-2-2/README.md
rename to docs/release-notes/16/16-2-2/README.md
diff --git a/docs/release-notes/16-3-0/README.md b/docs/release-notes/16/16-3-0/README.md
similarity index 96%
rename from docs/release-notes/16-3-0/README.md
rename to docs/release-notes/16/16-3-0/README.md
index 88c3582e777..09527a217d1 100644
--- a/docs/release-notes/16-3-0/README.md
+++ b/docs/release-notes/16/16-3-0/README.md
@@ -38,7 +38,7 @@ The setting is available as a checkbox in the meeting template form and lets you
 
 ![Screenshot showing OpenProject meeting template with overlay to disable email notifications](openproject-16-3-meeting-notifications-highlighted.png)
 
-[Learn more about meeting management with OpenProject](../../user-guide/meetings/).
+[Learn more about meeting management with OpenProject](../../../user-guide/meetings/).
 
 ### Ongoing timers shown in the My time tracking module
 
@@ -54,19 +54,19 @@ Not familiar with the My time tracking module yet? [Learn more about it in our b
 
 In OpenProject 15.5, we introduced the ability to display a sum for the % Complete column in work package tables. In 16.3, this feature has been improved to ensure **accurate sums across different progress calculation modes**. This applies especially when some work packages do not contain values for Work or Remaining work.
 
-[Learn more about progress tracking and reporting with OpenProject](../../user-guide/time-and-costs/progress-tracking/).
+[Learn more about progress tracking and reporting with OpenProject](../../../user-guide/time-and-costs/progress-tracking/).
 
 ### Nextcloud Health check: Indicate missing token exchange capability (Enterprise add-on)
 
 Administrators using the Nextcloud integration in the Corporate plan can now benefit from a more specific health check. If **token exchange is configured but not supported by the linked identity provider** (e.g. due to older OIDC settings), the new check will now clearly identify this issue. This helps diagnose connection problems more reliably and avoids misleading error messages about token refresh failures.
 
-[Learn more about monitoring your OpenProject installation](../../installation-and-operations/operation/monitoring/).
+[Learn more about monitoring your OpenProject installation](../../../installation-and-operations/operation/monitoring/).
 
 ### Autocomplete for cost reporting user and work package fields
 
 Creating **cost reports** is now easier and faster. OpenProject 16.3 introduces **autocomplete for key filter fields** like User, Project and Work package, helping you find the right person or task with just a few keystrokes.
 
-[Learn more about cost reporting with OpenProject](../../user-guide/time-and-costs/reporting/).
+[Learn more about cost reporting with OpenProject](../../../user-guide/time-and-costs/reporting/).
 
 <!--more-->
 
@@ -150,5 +150,5 @@ Last but not least, we are very grateful for our very engaged translation contri
 - [William](https://crowdin.com/profile/williamfromtw), for a great number of translations into Chinese Traditional.
 - [OlhaTrotska](https://crowdin.com/profile/OlhaTrotska), for a great number of translations into Ukrainian.
 
-Would you like to help out with translations yourself? Then take a look at our [translation guide](../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
+Would you like to help out with translations yourself? Then take a look at our [translation guide](../../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
 
diff --git a/docs/release-notes/16-3-0/openproject-16-3-header-menu-highlighted.png b/docs/release-notes/16/16-3-0/openproject-16-3-header-menu-highlighted.png
similarity index 100%
rename from docs/release-notes/16-3-0/openproject-16-3-header-menu-highlighted.png
rename to docs/release-notes/16/16-3-0/openproject-16-3-header-menu-highlighted.png
diff --git a/docs/release-notes/16-3-0/openproject-16-3-meeting-notifications-highlighted.png b/docs/release-notes/16/16-3-0/openproject-16-3-meeting-notifications-highlighted.png
similarity index 100%
rename from docs/release-notes/16-3-0/openproject-16-3-meeting-notifications-highlighted.png
rename to docs/release-notes/16/16-3-0/openproject-16-3-meeting-notifications-highlighted.png
diff --git a/docs/release-notes/16-3-0/openproject-16-3-my-time-tracking-timer-calendar-view-highlighted.png b/docs/release-notes/16/16-3-0/openproject-16-3-my-time-tracking-timer-calendar-view-highlighted.png
similarity index 100%
rename from docs/release-notes/16-3-0/openproject-16-3-my-time-tracking-timer-calendar-view-highlighted.png
rename to docs/release-notes/16/16-3-0/openproject-16-3-my-time-tracking-timer-calendar-view-highlighted.png
diff --git a/docs/release-notes/16-3-0/openproject_user_guide_log_time_right_hand_overlay_menu.png b/docs/release-notes/16/16-3-0/openproject_user_guide_log_time_right_hand_overlay_menu.png
similarity index 100%
rename from docs/release-notes/16-3-0/openproject_user_guide_log_time_right_hand_overlay_menu.png
rename to docs/release-notes/16/16-3-0/openproject_user_guide_log_time_right_hand_overlay_menu.png
diff --git a/docs/release-notes/16-3-1/README.md b/docs/release-notes/16/16-3-1/README.md
similarity index 87%
rename from docs/release-notes/16-3-1/README.md
rename to docs/release-notes/16/16-3-1/README.md
index 57a2d76d86a..29dee7915c7 100644
--- a/docs/release-notes/16-3-1/README.md
+++ b/docs/release-notes/16/16-3-1/README.md
@@ -12,7 +12,7 @@ Release date: 2025-08-13
 
 We released OpenProject [OpenProject 16.3.1](https://community.openproject.org/versions/2218).
 
-A bug was identified that prevents the user account menu from displaying correctly if you use a [direct login provider](../../system-admin-guide/authentication/login-registration-settings/) instead of the standard login form.
+A bug was identified that prevents the user account menu from displaying correctly if you use a [direct login provider](../../../system-admin-guide/authentication/login-registration-settings/) instead of the standard login form.
 If you are not using a direct login provider, you are not affected by this.
 
 The release also contains some additional bug fixes that were not ready in time for the 16.3.0 release.
diff --git a/docs/release-notes/16-3-2/README.md b/docs/release-notes/16/16-3-2/README.md
similarity index 100%
rename from docs/release-notes/16-3-2/README.md
rename to docs/release-notes/16/16-3-2/README.md
diff --git a/docs/release-notes/16-4-0/README.md b/docs/release-notes/16/16-4-0/README.md
similarity index 96%
rename from docs/release-notes/16-4-0/README.md
rename to docs/release-notes/16/16-4-0/README.md
index 7fc33efc580..17facf52229 100644
--- a/docs/release-notes/16-4-0/README.md
+++ b/docs/release-notes/16/16-4-0/README.md
@@ -25,7 +25,7 @@ Users can now enable **automatic color mode** under *Account settings → Interf
 > [!NOTE]
 > If a user has enabled dark mode — either by default or through automatic switching — this overrides the instance’s design settings for that user.
 
-[Learn more about the *Look and feel* options in OpenProject](../../user-guide/account-settings/#look-and-feel). 
+[Learn more about the *Look and feel* options in OpenProject](../../../user-guide/account-settings/#look-and-feel). 
 
 ![Screenshot of OpenProject 16.4: Account settings to adjust color mode, Automatic mode selected](openproject-16-4-color-mode-light-1.png)
 
@@ -50,7 +50,7 @@ The exported PDF includes:
 - All selected attributes from the project list, shown in the same order as in the table.
 - Section titles linked to the respective project in OpenProject.
 
-To export a project list, open the **More (three dots)** menu in the top right corner of the list and select Export. In the export modal, you can choose between XLS, CSV, or PDF. [Read more about project lists in our documentation](../../user-guide/projects/project-lists/#export-project-lists).
+To export a project list, open the **More (three dots)** menu in the top right corner of the list and select Export. In the export modal, you can choose between XLS, CSV, or PDF. [Read more about project lists in our documentation](../../../user-guide/projects/project-lists/#export-project-lists).
 
 ![Screenshot of OpenProject 16.4: Export modal for PDF export of project lists, choosing the file format - XLS, CSV and PDF](openproject-16-4-export-project-list-highlighted.png)
 
@@ -86,7 +86,7 @@ Other meetings improvements include:
 - Ability to remove participants directly from the dialog.
 - Cleaner display in the meeting right side and PDF export: only Attended is shown (no more 'Invited' label).
 
-[Learn more about meeting management with OpenProject](../../user-guide/meetings/#meeting-management).
+[Learn more about meeting management with OpenProject](../../../user-guide/meetings/#meeting-management).
 
 ![Screenshot of OpenProject 16.4: Meeting participants modal with autocomplete and 'Mark as attended' button](openproject-16-4-meeting-participants.png)
 
@@ -102,7 +102,7 @@ Key capabilities include:
 - Distinguish between locally managed and synchronized memberships.
 - Retain full administrative control to rename or delete synced groups and memberships.
 
-This provides flexibility for organizations, especially when self-registration is enabled. Unlike LDAP synchronization, group updates are applied on login, giving admins full control over membership changes. [Read more about OIDC in our documentation](../../system-admin-guide/authentication/openid-providers/).
+This provides flexibility for organizations, especially when self-registration is enabled. Unlike LDAP synchronization, group updates are applied on login, giving admins full control over membership changes. [Read more about OIDC in our documentation](../../../system-admin-guide/authentication/openid-providers/).
 
 This feature was developed with the support of Helmholtz-Zentrum Berlin.
 
@@ -112,7 +112,7 @@ With OpenProject 16.4, it is now easier to set up and track budgets. When creati
 
 In addition, **project lists** now include columns for planned budget, spent budget, spent percentage, and available budget, giving you a clearer overview across projects.
 
-These updates make budgeting more practical for everyday use, and we will continue to expand budgets and cost management in future releases. [Read more about budgets in our user guide](../../user-guide/budgets/).
+These updates make budgeting more practical for everyday use, and we will continue to expand budgets and cost management in future releases. [Read more about budgets in our user guide](../../../user-guide/budgets/).
 
 ![Screenshot of OpenProject 16.4: New budget with highlighted Base amount](openproject-16-4-budgets-highlighted.png)
 
@@ -143,7 +143,7 @@ The SCIM server functionality (Enterprise add-on) introduced in OpenProject 16.2
 
 - **Clear error for insufficient plan**: If the Enterprise subscription level does not include SCIM, the server now returns a 403 Forbidden with a clear message instead of a generic 401 error.
 
-These changes make SCIM integrations more robust and transparent, improving interoperability with identity providers. [Read more about SCIM provisioning in our documentation](../../system-admin-guide/authentication/scim/).
+These changes make SCIM integrations more robust and transparent, improving interoperability with identity providers. [Read more about SCIM provisioning in our documentation](../../../system-admin-guide/authentication/scim/).
 
 <!--more-->
 
@@ -248,4 +248,4 @@ Last but not least, we are very grateful for our very engaged translation contri
 - [William](https://crowdin.com/profile/williamfromtw), for a great number of translations into Chinese Traditional.
 - [OlhaTrotska](https://crowdin.com/profile/OlhaTrotska), for a great number of translations into Ukrainian.
 
-Would you like to help out with translations yourself? Then take a look at our [translation guide](../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
+Would you like to help out with translations yourself? Then take a look at our [translation guide](../../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
diff --git a/docs/release-notes/16-4-0/open_project_user_guide_project_settings_overview.png b/docs/release-notes/16/16-4-0/open_project_user_guide_project_settings_overview.png
similarity index 100%
rename from docs/release-notes/16-4-0/open_project_user_guide_project_settings_overview.png
rename to docs/release-notes/16/16-4-0/open_project_user_guide_project_settings_overview.png
diff --git a/docs/release-notes/16-4-0/openproject-16-4-budgets-highlighted.png b/docs/release-notes/16/16-4-0/openproject-16-4-budgets-highlighted.png
similarity index 100%
rename from docs/release-notes/16-4-0/openproject-16-4-budgets-highlighted.png
rename to docs/release-notes/16/16-4-0/openproject-16-4-budgets-highlighted.png
diff --git a/docs/release-notes/16-4-0/openproject-16-4-color-mode-light-1.png b/docs/release-notes/16/16-4-0/openproject-16-4-color-mode-light-1.png
similarity index 100%
rename from docs/release-notes/16-4-0/openproject-16-4-color-mode-light-1.png
rename to docs/release-notes/16/16-4-0/openproject-16-4-color-mode-light-1.png
diff --git a/docs/release-notes/16-4-0/openproject-16-4-color-mode.png b/docs/release-notes/16/16-4-0/openproject-16-4-color-mode.png
similarity index 100%
rename from docs/release-notes/16-4-0/openproject-16-4-color-mode.png
rename to docs/release-notes/16/16-4-0/openproject-16-4-color-mode.png
diff --git a/docs/release-notes/16-4-0/openproject-16-4-export-project-list-highlighted.png b/docs/release-notes/16/16-4-0/openproject-16-4-export-project-list-highlighted.png
similarity index 100%
rename from docs/release-notes/16-4-0/openproject-16-4-export-project-list-highlighted.png
rename to docs/release-notes/16/16-4-0/openproject-16-4-export-project-list-highlighted.png
diff --git a/docs/release-notes/16-4-0/openproject-16-4-meeting-participants.png b/docs/release-notes/16/16-4-0/openproject-16-4-meeting-participants.png
similarity index 100%
rename from docs/release-notes/16-4-0/openproject-16-4-meeting-participants.png
rename to docs/release-notes/16/16-4-0/openproject-16-4-meeting-participants.png
diff --git a/docs/release-notes/16-4-0/openproject-16-4-pdf-export-font-highlighted.png b/docs/release-notes/16/16-4-0/openproject-16-4-pdf-export-font-highlighted.png
similarity index 100%
rename from docs/release-notes/16-4-0/openproject-16-4-pdf-export-font-highlighted.png
rename to docs/release-notes/16/16-4-0/openproject-16-4-pdf-export-font-highlighted.png
diff --git a/docs/release-notes/16-4-1/README.md b/docs/release-notes/16/16-4-1/README.md
similarity index 100%
rename from docs/release-notes/16-4-1/README.md
rename to docs/release-notes/16/16-4-1/README.md
diff --git a/docs/release-notes/16-5-0/README.md b/docs/release-notes/16/16-5-0/README.md
similarity index 98%
rename from docs/release-notes/16-5-0/README.md
rename to docs/release-notes/16/16-5-0/README.md
index d183092ebcc..7fab2908eaf 100644
--- a/docs/release-notes/16-5-0/README.md
+++ b/docs/release-notes/16/16-5-0/README.md
@@ -27,7 +27,7 @@ You can now place a work package directly into a specific agenda section when ad
 
 In the *Notes* section, you can add text that will be displayed together with the meeting title in the *Meetings* tab of the work package.
 
-[See our user guide to learn more about how to add work packages to meetings](../../user-guide/work-packages/add-work-packages-to-meetings).
+[See our user guide to learn more about how to add work packages to meetings](../../../user-guide/work-packages/add-work-packages-to-meetings).
 
 ![OpenProject work package, Meetings tab: Modal to "Select a meeting" with the Meeting selected being a Marketing daily and a "Add to section" dropdown with two sections to choose from.](openproject-16-5-meeting-tab-highlighted.png)
 
@@ -42,7 +42,7 @@ Additionally, **checkboxes for high contrast** are now displayed, depending on t
 
 This new feature is particularly helpful for the automatic mode, where you can now differentiate whether you want high contrast to be displayed only in dark mode or only in light mode, for example.
 
-[Learn more about the *Look and feel* options in OpenProject](../../user-guide/account-settings/#look-and-feel).
+[Learn more about the *Look and feel* options in OpenProject](../../../user-guide/account-settings/#look-and-feel).
 
 ![OpenProject account settings / Interface: Look and feel options reduced to "Dark", "Light" and "Automatic". Automatic is selected and below two checkboxes are displayed:" Force high contrast when in Light mode" and "Force high-contrast when in Dark mode".](openproject-16-5-increase-contrast-automatic.png)
 
@@ -178,4 +178,4 @@ Last but not least, we are very grateful for our very engaged translation contri
 - [Samo](https://crowdin.com/profile/SamoE), for a great number of translations into Turkish.
 - [Kuma Yamashita](https://crowdin.com/profile/dredgk), for a great number of translations into Japanese.
 
-Would you like to help out with translations yourself? Then take a look at our [translation guide](../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
+Would you like to help out with translations yourself? Then take a look at our [translation guide](../../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
diff --git a/docs/release-notes/16-5-0/openproject-16-5-deep-link.png b/docs/release-notes/16/16-5-0/openproject-16-5-deep-link.png
similarity index 100%
rename from docs/release-notes/16-5-0/openproject-16-5-deep-link.png
rename to docs/release-notes/16/16-5-0/openproject-16-5-deep-link.png
diff --git a/docs/release-notes/16-5-0/openproject-16-5-increase-contrast-automatic.png b/docs/release-notes/16/16-5-0/openproject-16-5-increase-contrast-automatic.png
similarity index 100%
rename from docs/release-notes/16-5-0/openproject-16-5-increase-contrast-automatic.png
rename to docs/release-notes/16/16-5-0/openproject-16-5-increase-contrast-automatic.png
diff --git a/docs/release-notes/16-5-0/openproject-16-5-meeting-tab-highlighted.png b/docs/release-notes/16/16-5-0/openproject-16-5-meeting-tab-highlighted.png
similarity index 100%
rename from docs/release-notes/16-5-0/openproject-16-5-meeting-tab-highlighted.png
rename to docs/release-notes/16/16-5-0/openproject-16-5-meeting-tab-highlighted.png
diff --git a/docs/release-notes/16-5-0/openproject-16-5-updated-on.png b/docs/release-notes/16/16-5-0/openproject-16-5-updated-on.png
similarity index 100%
rename from docs/release-notes/16-5-0/openproject-16-5-updated-on.png
rename to docs/release-notes/16/16-5-0/openproject-16-5-updated-on.png
diff --git a/docs/release-notes/16-5-1/README.md b/docs/release-notes/16/16-5-1/README.md
similarity index 100%
rename from docs/release-notes/16-5-1/README.md
rename to docs/release-notes/16/16-5-1/README.md
diff --git a/docs/release-notes/16-6-0/README.md b/docs/release-notes/16/16-6-0/README.md
similarity index 97%
rename from docs/release-notes/16-6-0/README.md
rename to docs/release-notes/16/16-6-0/README.md
index 3f8d3f0e666..dced69ed617 100644
--- a/docs/release-notes/16-6-0/README.md
+++ b/docs/release-notes/16/16-6-0/README.md
@@ -61,7 +61,7 @@ While this is a small update by itself, it marks the beginning of a major improv
 
 ### Possibility to change parent of a custom field item (Enterprise add-on)
 
-Administrators can now change the parent of an item within a [hierarchical custom field (Enterprise add-on)](../../system-admin-guide/custom-fields/#hierarchy-custom-field-enterprise-add-on) or project attribute. This makes it easier to rearrange existing items without recreating them from scratch. 
+Administrators can now change the parent of an item within a [hierarchical custom field (Enterprise add-on)](../../../system-admin-guide/custom-fields/#hierarchy-custom-field-enterprise-add-on) or project attribute. This makes it easier to rearrange existing items without recreating them from scratch. 
 
 To do so, administrators need to navigate to *Administration → Custom fields*, select a custom field type hierarchy and click on the *Items* tab. Then they click on the *More* icon and select *Change parent*. A dialog opens showing the current hierarchy tree. From there, administrators can search, select a new parent, and save the updated structure. The hierarchy is updated immediately after saving. Like mentioned above, this also works for project attributes.
 
@@ -73,7 +73,7 @@ In the Meetings module, the *More (three dots) menu* for agenda items has been i
 
 The new *Move → Move to section* option opens a dialog where users can select the desired section from a dropdown list. Additionally, users can still move an agenda item to the backlog or to the next meeting (if it's part of a meeting series).
 
-[Learn more about meeting management with OpenProject](../../user-guide/work-packages/add-work-packages-to-meetings).
+[Learn more about meeting management with OpenProject](../../../user-guide/work-packages/add-work-packages-to-meetings).
 
 ![OpenProject 16.6: Meetings module showing the options when clicking on the More menu on an agenda item](meetings_move_menu.png)
 
@@ -89,7 +89,7 @@ In *Administration → Work packages → Workflows*, the workflow table now feat
 
 Additionally, the table is now split into three tabs — *Default transitions*, *User is author*, and *User is assignee* — each showing the relevant workflow configuration. Before 16.6, these additional transitions were often overlooked as they were positioned below the table.
 
-[Read more about managing work package workflows in OpenProject](../../system-admin-guide/manage-work-packages/work-package-workflows/).
+[Read more about managing work package workflows in OpenProject](../../../system-admin-guide/manage-work-packages/work-package-workflows/).
 
 ![OpenProject 16.6: Administration for work package workflows highlighting the new tabs and that the header and right column are sticky when scrolling](openproject-16-6-work-package-workflow-highlighted.png)
 
@@ -191,4 +191,4 @@ Last but not least, we are very grateful for our very engaged translation contri
 - [Pickart](https://crowdin.com/profile/fantasmak10), for a great number of translations into Catalan.
 - [Maxime77](https://crowdin.com/profile/maxime77), for a great number of translations into French.
 
-Would you like to help out with translations yourself? Then take a look at our [translation guide](../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
+Would you like to help out with translations yourself? Then take a look at our [translation guide](../../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
diff --git a/docs/release-notes/16-6-0/meetings_move_menu.png b/docs/release-notes/16/16-6-0/meetings_move_menu.png
similarity index 100%
rename from docs/release-notes/16-6-0/meetings_move_menu.png
rename to docs/release-notes/16/16-6-0/meetings_move_menu.png
diff --git a/docs/release-notes/16-6-0/openproject-16-6-custom-field-hierarchy-change-parent.png b/docs/release-notes/16/16-6-0/openproject-16-6-custom-field-hierarchy-change-parent.png
similarity index 100%
rename from docs/release-notes/16-6-0/openproject-16-6-custom-field-hierarchy-change-parent.png
rename to docs/release-notes/16/16-6-0/openproject-16-6-custom-field-hierarchy-change-parent.png
diff --git a/docs/release-notes/16-6-0/openproject-16-6-documents-index-page.png b/docs/release-notes/16/16-6-0/openproject-16-6-documents-index-page.png
similarity index 100%
rename from docs/release-notes/16-6-0/openproject-16-6-documents-index-page.png
rename to docs/release-notes/16/16-6-0/openproject-16-6-documents-index-page.png
diff --git a/docs/release-notes/16-6-0/openproject-16-6-project-attributes-calculated-value.png b/docs/release-notes/16/16-6-0/openproject-16-6-project-attributes-calculated-value.png
similarity index 100%
rename from docs/release-notes/16-6-0/openproject-16-6-project-attributes-calculated-value.png
rename to docs/release-notes/16/16-6-0/openproject-16-6-project-attributes-calculated-value.png
diff --git a/docs/release-notes/16-6-0/openproject-16-6-project-attributes-hierarchy.png b/docs/release-notes/16/16-6-0/openproject-16-6-project-attributes-hierarchy.png
similarity index 100%
rename from docs/release-notes/16-6-0/openproject-16-6-project-attributes-hierarchy.png
rename to docs/release-notes/16/16-6-0/openproject-16-6-project-attributes-hierarchy.png
diff --git a/docs/release-notes/16-6-0/openproject-16-6-project-attributes-overview-page.png b/docs/release-notes/16/16-6-0/openproject-16-6-project-attributes-overview-page.png
similarity index 100%
rename from docs/release-notes/16-6-0/openproject-16-6-project-attributes-overview-page.png
rename to docs/release-notes/16/16-6-0/openproject-16-6-project-attributes-overview-page.png
diff --git a/docs/release-notes/16-6-0/openproject-16-6-project-attributes-updated.png b/docs/release-notes/16/16-6-0/openproject-16-6-project-attributes-updated.png
similarity index 100%
rename from docs/release-notes/16-6-0/openproject-16-6-project-attributes-updated.png
rename to docs/release-notes/16/16-6-0/openproject-16-6-project-attributes-updated.png
diff --git a/docs/release-notes/16-6-0/openproject-16-6-work-package-workflow-highlighted.png b/docs/release-notes/16/16-6-0/openproject-16-6-work-package-workflow-highlighted.png
similarity index 100%
rename from docs/release-notes/16-6-0/openproject-16-6-work-package-workflow-highlighted.png
rename to docs/release-notes/16/16-6-0/openproject-16-6-work-package-workflow-highlighted.png
diff --git a/docs/release-notes/16-6-1/README.md b/docs/release-notes/16/16-6-1/README.md
similarity index 100%
rename from docs/release-notes/16-6-1/README.md
rename to docs/release-notes/16/16-6-1/README.md
diff --git a/docs/release-notes/16-6-2/README.md b/docs/release-notes/16/16-6-2/README.md
similarity index 100%
rename from docs/release-notes/16-6-2/README.md
rename to docs/release-notes/16/16-6-2/README.md
diff --git a/docs/release-notes/16-6-3/README.md b/docs/release-notes/16/16-6-3/README.md
similarity index 100%
rename from docs/release-notes/16-6-3/README.md
rename to docs/release-notes/16/16-6-3/README.md
diff --git a/docs/release-notes/16-6-4/README.md b/docs/release-notes/16/16-6-4/README.md
similarity index 100%
rename from docs/release-notes/16-6-4/README.md
rename to docs/release-notes/16/16-6-4/README.md
diff --git a/docs/release-notes/16-6-5/README.md b/docs/release-notes/16/16-6-5/README.md
similarity index 93%
rename from docs/release-notes/16-6-5/README.md
rename to docs/release-notes/16/16-6-5/README.md
index 455a4b37579..f13648f6a66 100644
--- a/docs/release-notes/16-6-5/README.md
+++ b/docs/release-notes/16/16-6-5/README.md
@@ -31,7 +31,7 @@ The vulnerability has been responsibly disclosed through the [YesWeHack bounty p
 
 ### CVE-2026-23721 - Users with "View Members" permission in any project can view all Group memberships
 
-When using [groups](https://www.openproject.org/docs/system-admin-guide/users-permissions/groups/) in OpenProject to manage users, the group members should only be visible to users that have the *View Members* permission in **any project** that the group is also a member of.
+When using [groups](../../../system-admin-guide/users-permissions/groups/) in OpenProject to manage users, the group members should only be visible to users that have the *View Members* permission in **any project** that the group is also a member of.
 Due to a failed permission check, if a user had the *View Members* permission in any project, they could enumerate all Groups and view which other users are part of the group.
 
 This vulnerability was assigned as CVE-2026-23721.
diff --git a/docs/release-notes/16-6-6/README.md b/docs/release-notes/16/16-6-6/README.md
similarity index 100%
rename from docs/release-notes/16-6-6/README.md
rename to docs/release-notes/16/16-6-6/README.md
diff --git a/docs/release-notes/16-6-7/README.md b/docs/release-notes/16/16-6-7/README.md
similarity index 100%
rename from docs/release-notes/16-6-7/README.md
rename to docs/release-notes/16/16-6-7/README.md
diff --git a/docs/release-notes/16-6-8/README.md b/docs/release-notes/16/16-6-8/README.md
similarity index 100%
rename from docs/release-notes/16-6-8/README.md
rename to docs/release-notes/16/16-6-8/README.md
diff --git a/docs/release-notes/16/README.md b/docs/release-notes/16/README.md
new file mode 100644
index 00000000000..fb3cc37cb27
--- /dev/null
+++ b/docs/release-notes/16/README.md
@@ -0,0 +1,35 @@
+---
+sidebar_navigation:
+  title: '16.x'
+release_date: 2026-02-18
+title: OpenProject Version 16 Release Notes
+---
+
+# OpenProject Version 16 Release Notes
+
+| Version                       | Release date |
+|-------------------------------|--------------|
+| [OpenProject 16.6.8](16-6-8/) | 2026-02-18   |
+| [OpenProject 16.6.7](16-6-7/) | 2026-02-06   |
+| [OpenProject 16.6.6](16-6-6/) | 2026-01-27   |
+| [OpenProject 16.6.5](16-6-5/) | 2026-01-16   |
+| [OpenProject 16.6.4](16-6-4/) | 2026-01-08   |
+| [OpenProject 16.6.3](16-6-3/) | 2025-12-11   |
+| [OpenProject 16.6.2](16-6-2/) | 2025-12-02   |
+| [OpenProject 16.6.1](16-6-1/) | 2025-11-13   |
+| [OpenProject 16.6.0](16-6-0/) | 2025-11-05   |
+| [OpenProject 16.5.1](16-5-1/) | 2025-10-15   |
+| [OpenProject 16.5.0](16-5-0/) | 2025-10-08   |
+| [OpenProject 16.4.1](16-4-1/) | 2025-09-16   |
+| [OpenProject 16.4.0](16-4-0/) | 2025-09-10   |
+| [OpenProject 16.3.2](16-3-2/) | 2025-08-25   |
+| [OpenProject 16.3.1](16-3-1/) | 2025-08-13   |
+| [OpenProject 16.3.0](16-3-0/) | 2025-08-13   |
+| [OpenProject 16.2.2](16-2-2/) | 2025-08-07   |
+| [OpenProject 16.2.1](16-2-1/) | 2025-08-04   |
+| [OpenProject 16.2.0](16-2-0/) | 2025-07-16   |
+| [OpenProject 16.1.1](16-1-1/) | 2025-06-26   |
+| [OpenProject 16.1.0](16-1-0/) | 2025-06-18   |
+| [OpenProject 16.0.1](16-0-1/) | 2025-06-05   |
+| [OpenProject 16.0.0](16-0-0/) | 2025-05-21   |
+
diff --git a/docs/release-notes/17-0-1/README.md b/docs/release-notes/17-0-1/README.md
index 51c7f8b40f0..47d5f270fdd 100644
--- a/docs/release-notes/17-0-1/README.md
+++ b/docs/release-notes/17-0-1/README.md
@@ -29,7 +29,7 @@ The vulnerability has been responsibly disclosed through the [YesWeHack bounty p
 
 ### CVE-2026-23721 - Users with "View Members" permission in any project can view all Group memberships
 
-When using [groups](https://www.openproject.org/docs/system-admin-guide/users-permissions/groups/) in OpenProject to manage users, the group members should only be visible to users that have the *View Members* permission in **any project** that the group is also a member of.
+When using [groups](../../system-admin-guide/users-permissions/groups/) in OpenProject to manage users, the group members should only be visible to users that have the *View Members* permission in **any project** that the group is also a member of.
 Due to a failed permission check, if a user had the *View Members* permission in any project, they could enumerate all Groups and view which other users are part of the group.
 
 This vulnerability was assigned as CVE-2026-23721.
diff --git a/docs/release-notes/README.md b/docs/release-notes/README.md
index e0b81c56c96..e7232e35c13 100644
--- a/docs/release-notes/README.md
+++ b/docs/release-notes/README.md
@@ -19,28 +19,24 @@ Release date: 2026-03-11
 
 [Release Notes](17-2-0/)
 
-
 ## 17.1.2
 
 Release date: 2026-02-26
 
 [Release Notes](17-1-2/)
 
-
 ## 17.0.5
 
 Release date: 2026-02-26
 
 [Release Notes](17-0-5/)
 
-
 ## 17.1.1
 
 Release date: 2026-02-18
 
 [Release Notes](17-1-1/)
 
-
 ## 17.1.0
 
 Release date: 2026-02-11
@@ -53,24 +49,11 @@ Release date: 2026-02-18
 
 [Release Notes](17-0-4/)
 
-
 ## 17.0.3
 
 Release date: 2026-02-06
 
 [Release Notes](17-0-3/)
-## 16.6.8
-
-Release date: 2026-02-18
-
-[Release Notes](16-6-8/)
-
-
-## 16.6.7
-
-Release date: 2026-02-06
-
-[Release Notes](16-6-7/)
 
 ## 17.0.2
 
@@ -89,154 +72,12 @@ Release date: 2026-01-16
 Release date: 2026-01-14
 
 [Release Notes](17-0-0/)
-## 16.6.6
-
-Release date: 2026-01-27
-
-[Release Notes](16-6-6/)
-
-## 16.6.5
-
-Release date: 2026-01-16
-
-[Release Notes](16-6-5/)
-
-## 16.6.4
-
-Release date: 2026-01-08
-
-[Release Notes](16-6-4/)
-
-
-## 16.6.3
-
-Release date: 2025-12-11
-
-[Release Notes](16-6-3/)
-
-
-## 16.6.2
-
-Release date: 2025-12-02
-
-[Release Notes](16-6-2/)
-
-
-## 16.6.1
-
-Release date: 2025-11-13
-
-[Release Notes](16-6-1/)
-
-
-## 16.6.0
-
-Release date: 2025-11-05
-
-[Release Notes](16-6-0/)
-
-
-## 16.5.1
-
-Release date: 2025-10-15
-
-[Release Notes](16-5-1/)
-
-
-## 16.5.0
-
-Release date: 2025-10-08
-
-[Release Notes](16-5-0/)
-
-
-## 16.4.1
-
-Release date: 2025-09-16
-
-[Release Notes](16-4-1/)
-
-
-## 16.4.0
-
-Release date: 2025-09-10
-
-[Release Notes](16-4-0/)
-
-
-## 16.3.2
-
-Release date: 2025-08-25
-
-[Release Notes](16-3-2/)
-
-
-## 16.3.1
-
-Release date: 2025-08-13
-
-[Release Notes](16-3-1/)
-
-
-## 16.3.0
-
-Release date: 2025-08-13
-
-[Release Notes](16-3-0/)
-
-
-## 16.2.2
-
-Release date: 2025-08-07
-
-[Release Notes](16-2-2/)
-
-
-## 16.2.1
-
-Release date: 2025-08-04
-
-[Release Notes](16-2-1/)
-
-
-## 16.2.0
-
-Release date: 2025-07-16
-
-[Release Notes](16-2-0/)
-
-
-## 16.1.1
-
-Release date: 2025-06-26
-
-[Release Notes](16-1-1/)
-
-
-## 16.1.0
-
-Release date: 2025-06-18
-
-[Release Notes](16-1-0/)
-
-
-## 16.0.1
-
-Release date: 2025-06-05
-
-[Release Notes](16-0-1/)
-
-
-## 16.0.0
-
-Release date: 2025-05-21
-
-[Release Notes](16-0-0/)
 
 ## Older versions
 
 | Version     | Years              |
 |-------------|--------------------|
+| [16.x](16/) | 2025 / 2026        |
 | [15.x](15/) | 2024 / 2025        |
 | [14.x](14/) | 2024               |
 | [13.x](13/) | 2023 / 2024        |
diff --git a/docs/use-cases/project-management-pm2-pmflex/README.md b/docs/use-cases/project-management-pm2-pmflex/README.md
index 62300b33b4a..36815f2d665 100644
--- a/docs/use-cases/project-management-pm2-pmflex/README.md
+++ b/docs/use-cases/project-management-pm2-pmflex/README.md
@@ -86,7 +86,7 @@ Each PM² project is established as an individual OpenProject project, incorpora
 
 ### How to use project templates to quickly setup new PM² projects?
 
-You can also use **[project templates](https://www.openproject.org/docs/user-guide/projects/project-templates)** to make it easier to create new PM² projects with the same structure, set of enabled modules or **custom work package templates**. We highly recommend using **project templates** for standardizing PM² project setup across the organization. This will also help you guide users who are new to PM² methodology. Once a new PM² project is created using a template, it can then be modified in any way in order to allow the tailoring of the methodology.
+You can also use **[project templates](../../user-guide/projects/project-templates)** to make it easier to create new PM² projects with the same structure, set of enabled modules or **custom work package templates**. We highly recommend using **project templates** for standardizing PM² project setup across the organization. This will also help you guide users who are new to PM² methodology. Once a new PM² project is created using a template, it can then be modified in any way in order to allow the tailoring of the methodology.
 
 ### How to setup and manage PM² phases?
 
@@ -132,7 +132,7 @@ OpenProject provides multiple views for managing PM² project work effectively.
 * Tabular display of all project artefacts and deliverables
 * Customizable sorting, grouping, and filtering by PM² phases or artefact types
 
-These tables are highly customizable and can be [configured](https://www.openproject.org/docs/user-guide/work-packages/work-package-table-configuration) to show precisely the information you need. Tables can also be **sorted** (for example by id, name, start dates, project, assignee, priority), **grouped** and **filtered** to create highly precise views. They can also show nested parent-children relations in **hierarchy view**.
+These tables are highly customizable and can be [configured](../../user-guide/work-packages/work-package-table-configuration) to show precisely the information you need. Tables can also be **sorted** (for example by id, name, start dates, project, assignee, priority), **grouped** and **filtered** to create highly precise views. They can also show nested parent-children relations in **hierarchy view**.
 
 To quickly access your most used table views, save these as your **favorite filters**. These will be visible to all project members. For PM² we recommend sorting all tasks per phase. With this view you can fully focus on the essential tasks within the current phase.
 
@@ -143,7 +143,7 @@ To quickly access your most used table views, save these as your **favorite filt
 * Dependencies between tasks and artefacts  
 * Critical path analysis for phase gate readiness
 
-The [Gantt chart](https://www.openproject.org/docs/user-guide/gantt-chart) module allows you to quickly visualize planning of each phase in a timeline view that also displays [work package relations](https://www.openproject.org/docs/user-guide/work-packages/work-package-relations-hierarchies). Like table view, it can be filtered to create custom views that can be saved.
+The [Gantt chart](../../user-guide/gantt-chart) module allows you to quickly visualize planning of each phase in a timeline view that also displays [work package relations](../../user-guide/work-packages/work-package-relations-hierarchies). Like table view, it can be filtered to create custom views that can be saved.
 
 ![Gantt view showing the work packages in the Planning Phase](openproject_use_case_PM2_gantt_view_planning_phase_pm2.png)
 
@@ -179,6 +179,6 @@ PM² emphasizes **accountability, transparency, and stakeholder communication**,
 
 ## Here for you now!
 
-OpenProject is a powerful and highly-configurable tool that can be customized to fit the needs of your PM² implementation. Beyond the basics covered in this guide, OpenProject has many additional features and modules (such as [budgets](https://www.openproject.org/docs/user-guide/budgets), [time and cost tracking](https://www.openproject.org/docs/user-guide/time-and-costs), [wiki](https://www.openproject.org/docs/user-guide/wiki) and [file storage integrations](https://www.openproject.org/docs/development/file-storage-integration)) that further enable your PM² teams to work efficiently and deliver value.
+OpenProject is a powerful and highly-configurable tool that can be customized to fit the needs of your PM² implementation. Beyond the basics covered in this guide, OpenProject has many additional features and modules (such as [budgets](../../user-guide/budgets), [time and cost tracking](../../user-guide/time-and-costs), [wiki](../../user-guide/wiki) and [file storage integrations](../../development/file-storage-integration)) that further enable your PM² teams to work efficiently and deliver value.
 
-If you have questions about how to [use](https://www.openproject.org/docs/getting-started) and [configure](https://www.openproject.org/docs/system-admin-guide) OpenProject to work for you, please [get in touch](https://www.openproject.org/contact/) or [start a free trial](https://start.openproject.com/) to see for yourself.
+If you have questions about how to [use](../../getting-started) and [configure](../../system-admin-guide) OpenProject to work for you, please [get in touch](https://www.openproject.org/contact/) or [start a free trial](https://start.openproject.com/) to see for yourself.