diff --git a/docs/standards/CX-0136-UseCasePCF/CX-0136-UseCasePCF.md b/docs/standards/CX-0136-UseCasePCF/CX-0136-UseCasePCF.md
index c46bfeb0c..60c4a2e92 100644
--- a/docs/standards/CX-0136-UseCasePCF/CX-0136-UseCasePCF.md
+++ b/docs/standards/CX-0136-UseCasePCF/CX-0136-UseCasePCF.md
@@ -136,7 +136,7 @@ A formal, machine-readable semantic description (expressed with RDF/turtle) of d
 
 To participate in the CO2 use-case, the following standard MUST be fulfilled:
 
-- [Product Carbon Footprint Rulebook V4](https://catenax-ev.github.io/docs/next/non-functional/overview)
+- [Product Carbon Footprint Rulebook V4](https://catenax-ev.github.io/docs/next/rulebooks/overview)
 
 In addition, the following standards are used to support the PCF usecase. Athough they are NOT part of this specification, they are mentioned here, as APIs or other assets provided by them are used within the PCF usecase:
 
diff --git a/versioned_docs/version-24.03/non-functional/overview.md b/versioned_docs/version-24.03/non-functional/overview.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/versioned_docs/version-24.03/rulebooks/overview.md b/versioned_docs/version-24.03/rulebooks/overview.md
new file mode 100644
index 000000000..0f17199f0
--- /dev/null
+++ b/versioned_docs/version-24.03/rulebooks/overview.md
@@ -0,0 +1,12 @@
+---
+sidebar_position: 1
+title: Rulebooks
+sidebar_class_name: separator-bottom
+---
+
+This release does not contain versioned rulebook PDF documents yet.
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
+
diff --git a/versioned_docs/version-Io/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf b/versioned_docs/version-Io/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_DE.pdf
similarity index 100%
rename from versioned_docs/version-Io/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf
rename to versioned_docs/version-Io/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_DE.pdf
diff --git a/versioned_docs/version-Io/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf b/versioned_docs/version-Io/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_EN.pdf
similarity index 100%
rename from versioned_docs/version-Io/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf
rename to versioned_docs/version-Io/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_EN.pdf
diff --git a/versioned_docs/version-Io/rulebooks/CX-NFR-ESS/_category_.json b/versioned_docs/version-Io/rulebooks/CX-NFR-ESS/_category_.json
new file mode 100644
index 000000000..ce74504a1
--- /dev/null
+++ b/versioned_docs/version-Io/rulebooks/CX-NFR-ESS/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "ESS Code of Conduct v1.0",
+    "collapsible": true,
+    "collapsed": true
+}
+
diff --git a/versioned_docs/version-Saturn/non-functional/ess-codex-de.mdx b/versioned_docs/version-Io/rulebooks/CX-NFR-ESS/ess-codex-de.mdx
similarity index 82%
rename from versioned_docs/version-Saturn/non-functional/ess-codex-de.mdx
rename to versioned_docs/version-Io/rulebooks/CX-NFR-ESS/ess-codex-de.mdx
index 4d76e60d1..03d25f037 100644
--- a/versioned_docs/version-Saturn/non-functional/ess-codex-de.mdx
+++ b/versioned_docs/version-Io/rulebooks/CX-NFR-ESS/ess-codex-de.mdx
@@ -6,7 +6,7 @@ tags:
 ---
 
 <iframe
-  src={require('./assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf').default}
+  src={require('./CX-NFR-ESS-Codex_v.1.0_DE.pdf').default}
   width="100%"
   height="900px"
   style={{border: 'none'}}
@@ -16,3 +16,4 @@ tags:
 ## Legal
 
 Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
+
diff --git a/versioned_docs/version-Saturn/non-functional/ess-codex-en.mdx b/versioned_docs/version-Io/rulebooks/CX-NFR-ESS/ess-codex-en.mdx
similarity index 82%
rename from versioned_docs/version-Saturn/non-functional/ess-codex-en.mdx
rename to versioned_docs/version-Io/rulebooks/CX-NFR-ESS/ess-codex-en.mdx
index e6410ad49..40475517c 100644
--- a/versioned_docs/version-Saturn/non-functional/ess-codex-en.mdx
+++ b/versioned_docs/version-Io/rulebooks/CX-NFR-ESS/ess-codex-en.mdx
@@ -6,7 +6,7 @@ tags:
 ---
 
 <iframe
-  src={require('./assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf').default}
+  src={require('./CX-NFR-ESS-Codex_v.1.0_EN.pdf').default}
   width="100%"
   height="900px"
   style={{border: 'none'}}
@@ -16,3 +16,4 @@ tags:
 ## Legal
 
 Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
+
diff --git a/versioned_docs/version-Io/non-functional/assets/files/CX-NFR-PCF-Rulebook_v.3.1.pdf b/versioned_docs/version-Io/rulebooks/CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.3.1.pdf
similarity index 100%
rename from versioned_docs/version-Io/non-functional/assets/files/CX-NFR-PCF-Rulebook_v.3.1.pdf
rename to versioned_docs/version-Io/rulebooks/CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.3.1.pdf
diff --git a/versioned_docs/version-Io/rulebooks/CX-NFR-PCF/CX-NFR-PCF.mdx b/versioned_docs/version-Io/rulebooks/CX-NFR-PCF/CX-NFR-PCF.mdx
new file mode 100644
index 000000000..440718075
--- /dev/null
+++ b/versioned_docs/version-Io/rulebooks/CX-NFR-PCF/CX-NFR-PCF.mdx
@@ -0,0 +1,19 @@
+---
+sidebar_position: 2
+title: PCF Rulebook v3.1
+tags:
+  - UC/PCF
+---
+
+<iframe
+  src={require('./CX-NFR-PCF-Rulebook_v.3.1.pdf').default}
+  width="100%"
+  height="900px"
+  style={{border: 'none'}}
+  title="PCF Rulebook v3.1"
+/>
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
+
diff --git a/versioned_docs/version-Io/non-functional/assets/files/CX-NFR-PCF_TFS-verification_v.1.0.pdf b/versioned_docs/version-Io/rulebooks/CX-NFR-VF/CX-NFR-PCF_TFS-verification_v.1.0.pdf
similarity index 100%
rename from versioned_docs/version-Io/non-functional/assets/files/CX-NFR-PCF_TFS-verification_v.1.0.pdf
rename to versioned_docs/version-Io/rulebooks/CX-NFR-VF/CX-NFR-PCF_TFS-verification_v.1.0.pdf
diff --git a/versioned_docs/version-Io/rulebooks/CX-NFR-VF/CX-NFR-VF.mdx b/versioned_docs/version-Io/rulebooks/CX-NFR-VF/CX-NFR-VF.mdx
new file mode 100644
index 000000000..3ded7ab19
--- /dev/null
+++ b/versioned_docs/version-Io/rulebooks/CX-NFR-VF/CX-NFR-VF.mdx
@@ -0,0 +1,19 @@
+---
+sidebar_position: 3
+title: PCF Verification Framework v1.0
+tags:
+  - UC/PCF
+---
+
+<iframe
+  src={require('./CX-NFR-PCF_TFS-verification_v.1.0.pdf').default}
+  width="100%"
+  height="900px"
+  style={{border: 'none'}}
+  title="PCF Verification Framework v1.0"
+/>
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
+
diff --git a/versioned_docs/version-Io/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png b/versioned_docs/version-Io/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png
similarity index 100%
rename from versioned_docs/version-Io/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png
rename to versioned_docs/version-Io/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png
diff --git a/versioned_docs/version-Io/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png b/versioned_docs/version-Io/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png
similarity index 100%
rename from versioned_docs/version-Io/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png
rename to versioned_docs/version-Io/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png
diff --git a/versioned_docs/version-Io/non-functional/assets/images/CX-NFR-PCF-Rulebook_v.3.1.png b/versioned_docs/version-Io/rulebooks/assets/images/CX-NFR-PCF-Rulebook_v.3.1.png
similarity index 100%
rename from versioned_docs/version-Io/non-functional/assets/images/CX-NFR-PCF-Rulebook_v.3.1.png
rename to versioned_docs/version-Io/rulebooks/assets/images/CX-NFR-PCF-Rulebook_v.3.1.png
diff --git a/versioned_docs/version-Io/non-functional/assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png b/versioned_docs/version-Io/rulebooks/assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png
similarity index 100%
rename from versioned_docs/version-Io/non-functional/assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png
rename to versioned_docs/version-Io/rulebooks/assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png
diff --git a/versioned_docs/version-Jupiter/non-functional/overview.md b/versioned_docs/version-Io/rulebooks/overview.md
similarity index 53%
rename from versioned_docs/version-Jupiter/non-functional/overview.md
rename to versioned_docs/version-Io/rulebooks/overview.md
index b0106069b..6b727227d 100644
--- a/versioned_docs/version-Jupiter/non-functional/overview.md
+++ b/versioned_docs/version-Io/rulebooks/overview.md
@@ -1,6 +1,6 @@
 ---
 sidebar_position: 1
-title: Overview non-functional requirements
+title: Rulebooks
 sidebar_class_name: separator-bottom
 tags:
   - UC/PCF
@@ -9,9 +9,9 @@ tags:
 
 ## Product Carbon Footprint
 
-| PCF-Rulebook v3.0 | PCF-Verification Framework v1.0* |
+| PCF Rulebook v3.1 | PCF Verification Framework v1.0* |
 |:---:|:---:|
-| [![CX-NFR-PCF-Rulebook_v.3.0.png](./assets/images/CX-NFR-PCF-Rulebook_v.3.0.png)](./assets/files/CX-NFR-PCF-Rulebook_v.3.0.pdf) | [![CX-NFR-PCF_TFS-verification_v.1.0.png](./assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png)](./assets/files/CX-NFR-PCF_TFS-verification_v.1.0.pdf)  |
+| [![CX-NFR-PCF-Rulebook_v.3.1.png](./assets/images/CX-NFR-PCF-Rulebook_v.3.1.png)](./CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.3.1.pdf) | [![CX-NFR-PCF_TFS-verification_v.1.0.png](./assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png)](./CX-NFR-VF/CX-NFR-PCF_TFS-verification_v.1.0.pdf) |
 
 :::note[\*Please note]
 
@@ -23,4 +23,8 @@ When you start to work with die PCF verification framework please note, that the
 
 | ESS Code of Conduct v1.0 (German) | ESS Code of Conduct v1.0 (English) |
 |:---:|:---:|
-| [![CX-NFR-ESS-Codex_v.1.0_DE.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png)](./assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf) | [![CX-NFR-ESS-Codex_v.1.0_EN.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png)](./assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf) |
+| [![CX-NFR-ESS-Codex_v.1.0_DE.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png)](./CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_DE.pdf) | [![CX-NFR-ESS-Codex_v.1.0_EN.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png)](./CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_EN.pdf) |
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
diff --git a/versioned_docs/version-Jupiter/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_DE.pdf
similarity index 100%
rename from versioned_docs/version-Jupiter/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf
rename to versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_DE.pdf
diff --git a/versioned_docs/version-Jupiter/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_EN.pdf
similarity index 100%
rename from versioned_docs/version-Jupiter/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf
rename to versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_EN.pdf
diff --git a/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/_category_.json b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/_category_.json
new file mode 100644
index 000000000..ce74504a1
--- /dev/null
+++ b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "ESS Code of Conduct v1.0",
+    "collapsible": true,
+    "collapsed": true
+}
+
diff --git a/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/ess-codex-de.mdx b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/ess-codex-de.mdx
new file mode 100644
index 000000000..03d25f037
--- /dev/null
+++ b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/ess-codex-de.mdx
@@ -0,0 +1,19 @@
+---
+sidebar_position: 4
+title: ESS Code of Conduct v1.0 (German)
+tags:
+  - UC/ESS
+---
+
+<iframe
+  src={require('./CX-NFR-ESS-Codex_v.1.0_DE.pdf').default}
+  width="100%"
+  height="900px"
+  style={{border: 'none'}}
+  title="ESS Code of Conduct v1.0 (German)"
+/>
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
+
diff --git a/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/ess-codex-en.mdx b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/ess-codex-en.mdx
new file mode 100644
index 000000000..40475517c
--- /dev/null
+++ b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-ESS/ess-codex-en.mdx
@@ -0,0 +1,19 @@
+---
+sidebar_position: 5
+title: ESS Code of Conduct v1.0 (English)
+tags:
+  - UC/ESS
+---
+
+<iframe
+  src={require('./CX-NFR-ESS-Codex_v.1.0_EN.pdf').default}
+  width="100%"
+  height="900px"
+  style={{border: 'none'}}
+  title="ESS Code of Conduct v1.0 (English)"
+/>
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
+
diff --git a/versioned_docs/version-Jupiter/non-functional/assets/files/CX-NFR-PCF-Rulebook_v.3.0.pdf b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.3.0.pdf
similarity index 100%
rename from versioned_docs/version-Jupiter/non-functional/assets/files/CX-NFR-PCF-Rulebook_v.3.0.pdf
rename to versioned_docs/version-Jupiter/rulebooks/CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.3.0.pdf
diff --git a/versioned_docs/version-Jupiter/rulebooks/CX-NFR-PCF/CX-NFR-PCF.mdx b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-PCF/CX-NFR-PCF.mdx
new file mode 100644
index 000000000..8f11fb081
--- /dev/null
+++ b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-PCF/CX-NFR-PCF.mdx
@@ -0,0 +1,19 @@
+---
+sidebar_position: 2
+title: PCF Rulebook v3.0
+tags:
+  - UC/PCF
+---
+
+<iframe
+  src={require('./CX-NFR-PCF-Rulebook_v.3.0.pdf').default}
+  width="100%"
+  height="900px"
+  style={{border: 'none'}}
+  title="PCF Rulebook v3.0"
+/>
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
+
diff --git a/versioned_docs/version-Jupiter/non-functional/assets/files/CX-NFR-PCF_TFS-verification_v.1.0.pdf b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-VF/CX-NFR-PCF_TFS-verification_v.1.0.pdf
similarity index 100%
rename from versioned_docs/version-Jupiter/non-functional/assets/files/CX-NFR-PCF_TFS-verification_v.1.0.pdf
rename to versioned_docs/version-Jupiter/rulebooks/CX-NFR-VF/CX-NFR-PCF_TFS-verification_v.1.0.pdf
diff --git a/versioned_docs/version-Jupiter/rulebooks/CX-NFR-VF/CX-NFR-VF.mdx b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-VF/CX-NFR-VF.mdx
new file mode 100644
index 000000000..3ded7ab19
--- /dev/null
+++ b/versioned_docs/version-Jupiter/rulebooks/CX-NFR-VF/CX-NFR-VF.mdx
@@ -0,0 +1,19 @@
+---
+sidebar_position: 3
+title: PCF Verification Framework v1.0
+tags:
+  - UC/PCF
+---
+
+<iframe
+  src={require('./CX-NFR-PCF_TFS-verification_v.1.0.pdf').default}
+  width="100%"
+  height="900px"
+  style={{border: 'none'}}
+  title="PCF Verification Framework v1.0"
+/>
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
+
diff --git a/versioned_docs/version-Jupiter/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png b/versioned_docs/version-Jupiter/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png
similarity index 100%
rename from versioned_docs/version-Jupiter/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png
rename to versioned_docs/version-Jupiter/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png
diff --git a/versioned_docs/version-Jupiter/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png b/versioned_docs/version-Jupiter/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png
similarity index 100%
rename from versioned_docs/version-Jupiter/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png
rename to versioned_docs/version-Jupiter/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png
diff --git a/versioned_docs/version-Jupiter/non-functional/assets/images/CX-NFR-PCF-Rulebook_v.3.0.png b/versioned_docs/version-Jupiter/rulebooks/assets/images/CX-NFR-PCF-Rulebook_v.3.0.png
similarity index 100%
rename from versioned_docs/version-Jupiter/non-functional/assets/images/CX-NFR-PCF-Rulebook_v.3.0.png
rename to versioned_docs/version-Jupiter/rulebooks/assets/images/CX-NFR-PCF-Rulebook_v.3.0.png
diff --git a/versioned_docs/version-Jupiter/non-functional/assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png b/versioned_docs/version-Jupiter/rulebooks/assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png
similarity index 100%
rename from versioned_docs/version-Jupiter/non-functional/assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png
rename to versioned_docs/version-Jupiter/rulebooks/assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png
diff --git a/versioned_docs/version-Io/non-functional/overview.md b/versioned_docs/version-Jupiter/rulebooks/overview.md
similarity index 65%
rename from versioned_docs/version-Io/non-functional/overview.md
rename to versioned_docs/version-Jupiter/rulebooks/overview.md
index d2b49cd51..577a229c2 100644
--- a/versioned_docs/version-Io/non-functional/overview.md
+++ b/versioned_docs/version-Jupiter/rulebooks/overview.md
@@ -1,6 +1,6 @@
 ---
 sidebar_position: 1
-title: Overview non-functional requirements
+title: Rulebooks
 sidebar_class_name: separator-bottom
 tags:
   - UC/PCF
@@ -9,9 +9,9 @@ tags:
 
 ## Product Carbon Footprint
 
-| PCF-Rulebook v3.1 | PCF-Verification Framework v1.0* |
+| PCF Rulebook v3.0 | PCF Verification Framework v1.0* |
 |:---:|:---:|
-| [![CX-NFR-PCF-Rulebook_v.3.0.png](./assets/images/CX-NFR-PCF-Rulebook_v.3.1.png)](./assets/files/CX-NFR-PCF-Rulebook_v.3.1.pdf) | [![CX-NFR-PCF_TFS-verification_v.1.0.png](./assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png)](./assets/files/CX-NFR-PCF_TFS-verification_v.1.0.pdf)  |
+| [![CX-NFR-PCF-Rulebook_v.3.0.png](./assets/images/CX-NFR-PCF-Rulebook_v.3.0.png)](./CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.3.0.pdf) | [![CX-NFR-PCF_TFS-verification_v.1.0.png](./assets/images/CX-NFR-PCF_TFS-verification_v.1.0.png)](./CX-NFR-VF/CX-NFR-PCF_TFS-verification_v.1.0.pdf) |
 
 :::note[\*Please note]
 
@@ -23,7 +23,7 @@ When you start to work with die PCF verification framework please note, that the
 
 | ESS Code of Conduct v1.0 (German) | ESS Code of Conduct v1.0 (English) |
 |:---:|:---:|
-| [![CX-NFR-ESS-Codex_v.1.0_DE.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png)](./assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf) | [![CX-NFR-ESS-Codex_v.1.0_EN.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png)](./assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf) |
+| [![CX-NFR-ESS-Codex_v.1.0_DE.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png)](./CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_DE.pdf) | [![CX-NFR-ESS-Codex_v.1.0_EN.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png)](./CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_EN.pdf) |
 
 ## Legal
 
diff --git a/versioned_docs/version-Jupiter/standards/CX-0029-ProductCarbonFootprintRulebook/CX-0029-ProductCarbonFootprintRulebook.md b/versioned_docs/version-Jupiter/standards/CX-0029-ProductCarbonFootprintRulebook/CX-0029-ProductCarbonFootprintRulebook.md
index 38591e8ff..93928a4dc 100644
--- a/versioned_docs/version-Jupiter/standards/CX-0029-ProductCarbonFootprintRulebook/CX-0029-ProductCarbonFootprintRulebook.md
+++ b/versioned_docs/version-Jupiter/standards/CX-0029-ProductCarbonFootprintRulebook/CX-0029-ProductCarbonFootprintRulebook.md
@@ -3,7 +3,7 @@
 :::note[Note 1: Only available as a PDF-File]
 As CX-0029 has been re-classified as a *non-technical requirement*
 
-**Link to the new Version**: [NFR-PCF-Rulebook v3.0](./../../non-functional/assets/files/CX-NFR-PCF-Rulebook_v.3.0.pdf)
+**Link to the new Version**: [NFR-PCF-Rulebook v3.0](./../../rulebooks/CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.3.0.pdf)
 :::
 
 :::note[Note 2: Re-Classification]
diff --git a/versioned_docs/version-Saturn/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf b/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_DE.pdf
similarity index 100%
rename from versioned_docs/version-Saturn/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf
rename to versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_DE.pdf
diff --git a/versioned_docs/version-Saturn/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf b/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_EN.pdf
similarity index 100%
rename from versioned_docs/version-Saturn/non-functional/assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf
rename to versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_EN.pdf
diff --git a/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/_category_.json b/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/_category_.json
new file mode 100644
index 000000000..ce74504a1
--- /dev/null
+++ b/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "ESS Code of Conduct v1.0",
+    "collapsible": true,
+    "collapsed": true
+}
+
diff --git a/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/ess-codex-de.mdx b/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/ess-codex-de.mdx
new file mode 100644
index 000000000..ee8199805
--- /dev/null
+++ b/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/ess-codex-de.mdx
@@ -0,0 +1,18 @@
+---
+sidebar_position: 4
+title: ESS Code of Conduct v1.0 (German)
+tags:
+  - UC/ESS
+---
+
+<iframe
+  src={require('./CX-NFR-ESS-Codex_v.1.0_DE.pdf').default}
+  width="100%"
+  height="900px"
+  style={{border: 'none'}}
+  title="ESS Code of Conduct v1.0 (German)"
+/>
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
diff --git a/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/ess-codex-en.mdx b/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/ess-codex-en.mdx
new file mode 100644
index 000000000..981e30119
--- /dev/null
+++ b/versioned_docs/version-Saturn/rulebooks/CX-NFR-ESS/ess-codex-en.mdx
@@ -0,0 +1,18 @@
+---
+sidebar_position: 5
+title: ESS Code of Conduct v1.0 (English)
+tags:
+  - UC/ESS
+---
+
+<iframe
+  src={require('./CX-NFR-ESS-Codex_v.1.0_EN.pdf').default}
+  width="100%"
+  height="900px"
+  style={{border: 'none'}}
+  title="ESS Code of Conduct v1.0 (English)"
+/>
+
+## Legal
+
+Copyright © 2025 Catena-X Automotive Network e.V. All rights reserved. For more information, please visit [here](/copyright).
diff --git a/versioned_docs/version-Saturn/non-functional/assets/files/CX-NFR-PCF-Rulebook_v.4.0.pdf b/versioned_docs/version-Saturn/rulebooks/CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.4.0.pdf
similarity index 100%
rename from versioned_docs/version-Saturn/non-functional/assets/files/CX-NFR-PCF-Rulebook_v.4.0.pdf
rename to versioned_docs/version-Saturn/rulebooks/CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.4.0.pdf
diff --git a/versioned_docs/version-Saturn/non-functional/pcf-rulebook.mdx b/versioned_docs/version-Saturn/rulebooks/CX-NFR-PCF/CX-NFR-PCF.mdx
similarity index 81%
rename from versioned_docs/version-Saturn/non-functional/pcf-rulebook.mdx
rename to versioned_docs/version-Saturn/rulebooks/CX-NFR-PCF/CX-NFR-PCF.mdx
index f2b24285b..b0d02b7b5 100644
--- a/versioned_docs/version-Saturn/non-functional/pcf-rulebook.mdx
+++ b/versioned_docs/version-Saturn/rulebooks/CX-NFR-PCF/CX-NFR-PCF.mdx
@@ -6,7 +6,7 @@ tags:
 ---
 
 <iframe
-  src={require('./assets/files/CX-NFR-PCF-Rulebook_v.4.0.pdf').default}
+  src={require('./CX-NFR-PCF-Rulebook_v.4.0.pdf').default}
   width="100%"
   height="900px"
   style={{border: 'none'}}
diff --git a/versioned_docs/version-Saturn/non-functional/assets/files/CX-NFR-PCF_TFS-verification_v.2.0.pdf b/versioned_docs/version-Saturn/rulebooks/CX-NFR-VF/CX-NFR-PCF_TFS-verification_v.2.0.pdf
similarity index 100%
rename from versioned_docs/version-Saturn/non-functional/assets/files/CX-NFR-PCF_TFS-verification_v.2.0.pdf
rename to versioned_docs/version-Saturn/rulebooks/CX-NFR-VF/CX-NFR-PCF_TFS-verification_v.2.0.pdf
diff --git a/versioned_docs/version-Saturn/non-functional/pcf-tfs-verification.mdx b/versioned_docs/version-Saturn/rulebooks/CX-NFR-VF/CX-NFR-VF.mdx
similarity index 82%
rename from versioned_docs/version-Saturn/non-functional/pcf-tfs-verification.mdx
rename to versioned_docs/version-Saturn/rulebooks/CX-NFR-VF/CX-NFR-VF.mdx
index 8c77ba223..c912c81b9 100644
--- a/versioned_docs/version-Saturn/non-functional/pcf-tfs-verification.mdx
+++ b/versioned_docs/version-Saturn/rulebooks/CX-NFR-VF/CX-NFR-VF.mdx
@@ -6,7 +6,7 @@ tags:
 ---
 
 <iframe
-  src={require('./assets/files/CX-NFR-PCF_TFS-verification_v.2.0.pdf').default}
+  src={require('./CX-NFR-PCF_TFS-verification_v.2.0.pdf').default}
   width="100%"
   height="900px"
   style={{border: 'none'}}
diff --git a/versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png b/versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png
similarity index 100%
rename from versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png
rename to versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png
diff --git a/versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png b/versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png
similarity index 100%
rename from versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png
rename to versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png
diff --git a/versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-PCF-Rulebook.png b/versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-PCF-Rulebook.png
similarity index 100%
rename from versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-PCF-Rulebook.png
rename to versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-PCF-Rulebook.png
diff --git a/versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-PCF-TFS-Verification-Program.png b/versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-PCF-TFS-Verification-Program.png
similarity index 100%
rename from versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-PCF-TFS-Verification-Program.png
rename to versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-PCF-TFS-Verification-Program.png
diff --git a/versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-PCF_TFS-verification.png b/versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-PCF_TFS-verification.png
similarity index 100%
rename from versioned_docs/version-Saturn/non-functional/assets/images/CX-NFR-PCF_TFS-verification.png
rename to versioned_docs/version-Saturn/rulebooks/assets/images/CX-NFR-PCF_TFS-verification.png
diff --git a/versioned_docs/version-Saturn/non-functional/overview.md b/versioned_docs/version-Saturn/rulebooks/overview.md
similarity index 56%
rename from versioned_docs/version-Saturn/non-functional/overview.md
rename to versioned_docs/version-Saturn/rulebooks/overview.md
index 9b255a3b9..b402b3f7c 100644
--- a/versioned_docs/version-Saturn/non-functional/overview.md
+++ b/versioned_docs/version-Saturn/rulebooks/overview.md
@@ -1,6 +1,6 @@
 ---
 sidebar_position: 1
-title: Overview non-functional requirements
+title: Rulebooks
 sidebar_class_name: separator-bottom
 tags:
   - UC/PCF
@@ -11,13 +11,13 @@ tags:
 
 | PCF-Rulebook v4.0 | PCF Verification and Certification Framework v2.0 |
 |:---:|:---:|
-| [![CX-NFR-PCF-Rulebook_v.4.0.png](./assets/images/CX-NFR-PCF-Rulebook.png)](./assets/files/CX-NFR-PCF-Rulebook_v.4.0.pdf) | [![CX-NFR-PCF-TFS Verification Program.png](./assets/images/CX-NFR-PCF-TFS-Verification-Program.png)](./assets/files/CX-NFR-PCF_TFS-verification_v.2.0.pdf)  |
+| [![CX-NFR-PCF-Rulebook_v.4.0.png](./assets/images/CX-NFR-PCF-Rulebook.png)](./CX-NFR-PCF/CX-NFR-PCF-Rulebook_v.4.0.pdf) | [![CX-NFR-PCF-TFS Verification Program.png](./assets/images/CX-NFR-PCF-TFS-Verification-Program.png)](./CX-NFR-VF/CX-NFR-PCF_TFS-verification_v.2.0.pdf) |
 
 ## ESS Code of Conduct
 
 | ESS Code of Conduct v1.0 (German) | ESS Code of Conduct v1.0 (English) |
 |:---:|:---:|
-| [![CX-NFR-ESS-Codex_v.1.0_DE.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png)](./assets/files/CX-NFR-ESS-Codex_v.1.0_DE.pdf) | [![CX-NFR-ESS-Codex_v.1.0_EN.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png)](./assets/files/CX-NFR-ESS-Codex_v.1.0_EN.pdf) |
+| [![CX-NFR-ESS-Codex_v.1.0_DE.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_DE.png)](./CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_DE.pdf) | [![CX-NFR-ESS-Codex_v.1.0_EN.png](./assets/images/CX-NFR-ESS-Codex_v.1.0_EN.png)](./CX-NFR-ESS/CX-NFR-ESS-Codex_v.1.0_EN.pdf) |
 
 ## Legal
 
diff --git a/versioned_docs/version-Saturn/standards/CX-0136-UseCasePCF/CX-0136-UseCasePCF.md b/versioned_docs/version-Saturn/standards/CX-0136-UseCasePCF/CX-0136-UseCasePCF.md
index 798783cd2..3f34fdb7c 100644
--- a/versioned_docs/version-Saturn/standards/CX-0136-UseCasePCF/CX-0136-UseCasePCF.md
+++ b/versioned_docs/version-Saturn/standards/CX-0136-UseCasePCF/CX-0136-UseCasePCF.md
@@ -136,7 +136,7 @@ A formal, machine-readable semantic description (expressed with RDF/turtle) of d
 
 To participate in the CO2 use-case, the following standard MUST be fulfilled:
 
-- [Product Carbon Footprint Rulebook V4](https://catenax-ev.github.io/docs/next/non-functional/overview)
+- [Product Carbon Footprint Rulebook V4](https://catenax-ev.github.io/docs/next/rulebooks/overview)
 
 In addition, the following standards are used to support the PCF usecase. Athough they are NOT part of this specification, they are mentioned here, as APIs or other assets provided by them are used within the PCF usecase:
 
diff --git a/versioned_sidebars/version-24.03-sidebars.json b/versioned_sidebars/version-24.03-sidebars.json
index ba6ed3192..6da9ceeaa 100644
--- a/versioned_sidebars/version-24.03-sidebars.json
+++ b/versioned_sidebars/version-24.03-sidebars.json
@@ -8,7 +8,7 @@
   "sidebar_non_functional": [
     {
       "type": "autogenerated",
-      "dirName": "non-functional"
+      "dirName": "rulebooks"
     }
   ],
   "sidebar_op_model": [
diff --git a/versioned_sidebars/version-Io-sidebars.json b/versioned_sidebars/version-Io-sidebars.json
index ba2bcc0de..b3d3c4a9e 100644
--- a/versioned_sidebars/version-Io-sidebars.json
+++ b/versioned_sidebars/version-Io-sidebars.json
@@ -8,7 +8,7 @@
   "sidebar_non_functional": [
     {
       "type": "autogenerated",
-      "dirName": "non-functional"
+      "dirName": "rulebooks"
     }
   ],
   "sidebar_op_model": [
diff --git a/versioned_sidebars/version-Jupiter-sidebars.json b/versioned_sidebars/version-Jupiter-sidebars.json
index ba2bcc0de..b3d3c4a9e 100644
--- a/versioned_sidebars/version-Jupiter-sidebars.json
+++ b/versioned_sidebars/version-Jupiter-sidebars.json
@@ -8,7 +8,7 @@
   "sidebar_non_functional": [
     {
       "type": "autogenerated",
-      "dirName": "non-functional"
+      "dirName": "rulebooks"
     }
   ],
   "sidebar_op_model": [
diff --git a/versioned_sidebars/version-Saturn-sidebars.json b/versioned_sidebars/version-Saturn-sidebars.json
index ba2bcc0de..b3d3c4a9e 100644
--- a/versioned_sidebars/version-Saturn-sidebars.json
+++ b/versioned_sidebars/version-Saturn-sidebars.json
@@ -8,7 +8,7 @@
   "sidebar_non_functional": [
     {
       "type": "autogenerated",
-      "dirName": "non-functional"
+      "dirName": "rulebooks"
     }
   ],
   "sidebar_op_model": [