diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-501/README.md b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0040/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-501/README.md
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0040/README.md
index aa1c5d29..40ca437c 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-501/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0040/README.md
@@ -1,4 +1,4 @@
-# CWE-501: Trust Boundary Violation
+# pyscg-0040: Respect Trust Boundaries
 
 Python's trust boundaries rely on explicit process isolation, rather than in-process access control within a single interpreter.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-501/compliant01.png b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0040/compliant01.png
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-501/compliant01.png
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0040/compliant01.png
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-501/noncompliant01.png b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0040/noncompliant01.png
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-501/noncompliant01.png
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0040/noncompliant01.png
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-798/README.md b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0041/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-798/README.md
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0041/README.md
index 04e9a5f6..3da447ed 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-798/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0041/README.md
@@ -1,4 +1,4 @@
-# CWE-798: Use of hardcoded credentials
+# pyscg-0041: Avoid Hardcoded Credentials
 
 Ensure that unique keys or secrets can be replaced or rejected at runtime and never hard-code sensitive information, such as passwords, and encryption keys in a component.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-798/compliant01.py b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0041/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-798/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0041/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-798/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0041/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-798/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0041/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/README.md b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/README.md
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/README.md
index 0e6b0bc4..b30fea1c 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/README.md
@@ -1,4 +1,4 @@
-# CWE-783: Operator Precedence Logic Error
+# pyscg-0042: Mind Operator Precedence
 
 Failing to understand the order of precedence in expressions that read and write to the same object can lead to unintended side effects.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/compliant01.py b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/example01.py b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/example01.py
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/example02.py b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/example02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/example02.py
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/example02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-783/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0042/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-472/README.md b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0055/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-472/README.md
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0055/README.md
index 1d834e55..97da527e 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-472/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0055/README.md
@@ -1,4 +1,4 @@
-# CWE-472: External Control of Assumed-Immutable Web Parameter
+# pyscg-0055: Validate Web Parameters
 
 Ensuring user roles are determined on the server side prevents attackers from manipulating permissions through client-side data.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-472/example01.py b/docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0055/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-472/example01.py
rename to docs/Secure-Coding-Guide-for-Python/01_introduction/pyscg-0055/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/README.md b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/README.md
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/README.md
index 72efefb7..830aba97 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/README.md
@@ -1,4 +1,4 @@
-# CWE-175: Improper Handling of Mixed Encoding
+# pyscg-0043: Handle Mixed Character Encoding
 
 Locale-dependent programs may produce unexpected behavior or security bypasses in an environment whose locale is unset, or not set to an appropriate value.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/compliant01.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/compliant02.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/example01.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/example01.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/example02.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/example02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/example02.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/example02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/example03.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/example03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/example03.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/example03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0043/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/README.md b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/README.md
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/README.md
index 9e62ed0f..d941ef64 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/README.md
@@ -1,4 +1,4 @@
-# CWE-180: Incorrect Behavior Order: Validate Before Canonicalize
+# pyscg-0044: Validate Before Canonicalize
 
 Normalize/canonicalize strings before validating them to prevent risky strings such as  `../../../../passwd` allowing directory traversal attacks, and to reduce `XSS` attacks.
 
@@ -7,7 +7,7 @@ The need for supporting multiple languages requires the use of an extended list
 Character Encoding systems such as `ASCII`, `Windows-1252`, or `UTF-8` consist of an agreed mapping between byte values and a human-readable character known as code points. Each code point represents a single relation between characters such as a fixed number "`\u002e`", its graphical representation "`.`", and name "`FULL STOP`"  [[Batchelder 2022]](https://www.youtube.com/watch?v=sgHbC6udIqc). Using the same encoding assures that equivalent strings have a unique binary representation Unicode Standard _annex #15, Unicode Normalization Forms_ [[Davis 2008]](https://wiki.sei.cmu.edu/confluence/display/java/Rule+AA.+References#RuleAA.References-Davis08). Different or unexpected changes in encoding can allow attackers to workaround validation or input sanitation affords.
 
 > [!WARNING]
-> Ensure to use allow lists to avoid having to maintain an deny list on a continuous basis (as exclusion lists are a moving target) as per [CWE-184: Incomplete List of Disallowed Input - Development Environment](../../CWE-693/CWE-184/README.md).
+> Ensure to use allow lists to avoid having to maintain an deny list on a continuous basis (as exclusion lists are a moving target) as per [pyscg-0047: Use Allow Lists Over Deny Lists](../../04_neutralization/pyscg-0047/README.md).
 
 <table>
     <tr>
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/compliant01.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/example01.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/example01.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-182/README.md b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0045/README.md
similarity index 74%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-182/README.md
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0045/README.md
index c729c4c2..9bf17842 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-182/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0045/README.md
@@ -1,8 +1,8 @@
-# CWE-182: Collapse of Data into Unsafe Value
+# pyscg-0045: Enforce Consistent Encoding
 
 Handling data between different encodings or while filtering out untrusted characters and strings can cause malicious content to slip through input sanitation.
 
-Encoding changes, such as changing from `UTF-8` to pure `ASCII`, can result in turning non-functional payloads, such as `<script生>`, into functional `<script>` tags. Mixed encoding modes [CWE-180: Incorrect Behavior Order: Validate Before Canonicalize - Development Environment](../../CWE-707/CWE-180/) can also play a role. The recommendation by [Batchelder 2022](https://www.youtube.com/watch?v=sgHbC6udIqc) to use a single type of encoding and mode is only applicable for a single project or supplier. The recommendation to always choose the `UTF-8` by [W3c.org 2025](https://www.w3.org/International/questions/qa-what-is-encoding) provides no guarantee and is already flawed by Windows having `Windows-1252` encoding for some Python installations.
+Encoding changes, such as changing from `UTF-8` to pure `ASCII`, can result in turning non-functional payloads, such as `<script生>`, into functional `<script>` tags. Mixed encoding modes [pyscg-0044: Validate Before Canonicalize](../pyscg-0044/README.md) can also play a role. The recommendation by [Batchelder 2022](https://www.youtube.com/watch?v=sgHbC6udIqc) to use a single type of encoding and mode is only applicable for a single project or supplier. The recommendation to always choose the `UTF-8` by [W3c.org 2025](https://www.w3.org/International/questions/qa-what-is-encoding) provides no guarantee and is already flawed by Windows having `Windows-1252` encoding for some Python installations.
 
 The `example01.py` is a crudely simplified version of two methods simulating two completely different systems using different encodings. We are simulating the data at rest and data in transit part in a variable named `floppy`. The write_message and read_message method would be delivered independently in a real world scenario, each with their own encoding.
 
@@ -64,8 +64,8 @@ The `example01.py` turns a non-functional `UTF-8` encoded message `<script��
 
 A compliant solution will have to adhere to at least:
 
-* [CWE-180: Incorrect Behavior Order: Validate Before Canonicalize](../../CWE-707/CWE-180/)
-* [CWE-184: Incomplete List of Disallowed Input - Development Environment](../CWE-184/README.md)
+* [pyscg-0044: Validate Before Canonicalize](../pyscg-0044/README.md)
+* [pyscg-0047: Use Allow Lists Over Deny Lists](../../04_neutralization/pyscg-0047/README.md)
 
 Reduction of data into a subset is not limited to strings and characters.
 
@@ -83,8 +83,8 @@ Reduction of data into a subset is not limited to strings and characters.
 |[MITRE CWE](http://cwe.mitre.org/)|Pillar: CWE-693, Protection Mechanism Failure \[online\], available from <https://cwe.mitre.org/data/definitions/693.html> \[Accessed April 2025\]|
 |[MITRE CWE](http://cwe.mitre.org/)|Base: CWE-182: Collapse of Data into Unsafe Value \[online\], available from <https://cwe.mitre.org/data/definitions/182.html> \[Accessed April 2025\]|
 |[SEI CERT Coding Standard for Java](https://wiki.sei.cmu.edu/confluence/display/java/SEI+CERT+Oracle+Coding+Standard+for+Java)|IDS11-J. Perform any string modifications before validation\[online\], available from: <https://wiki.sei.cmu.edu/confluence/display/java/IDS11-J.+Perform+any+string+modifications+before+validation> \[Accessed April 2025\]|
-|[OpenSSF Secure Coding in Python](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python)|CWE-180: Incorrect Behavior Order: Validate Before Canonicalize \[online\], available from <https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180> \[Accessed April 2025\]|
-|[OpenSSF Secure Coding in Python](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python)|CWE-184: Incomplete List of Disallowed Input \[online\], available from <https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-184/README.md> \[Accessed April 2025\]|
+|[OpenSSF Secure Coding in Python](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python)|pyscg-0044: Validate Before Canonicalize \[online\], available from <https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0044/README.md> \[Accessed April 2025\]|
+|[OpenSSF Secure Coding in Python](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python)|pyscg-0047: Use Allow Lists Over Deny Lists \[online\], available from <https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0047/README.md> \[Accessed April 2025\]|
 
 ## Bibliography
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-182/example01.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0045/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-182/example01.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0045/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-838/README.md b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0046/README.md
similarity index 89%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-838/README.md
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0046/README.md
index 7e5dce56..4b953475 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-838/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0046/README.md
@@ -1,8 +1,8 @@
-# CWE-838: Inappropriate Encoding for Output Context
+# pyscg-0046: Context-Appropriate Output Encoding
 
 Inappropriate handling of an encoding from untrusted sources or unexpected encoding can lead to unexpected values, data loss, or become the root cause of an attack.
 
-Mixed encoding can lead to unexpected results and become a root cause for attacks as showcased in [CWE-180: Incorrect behavior order: Validate before Canonicalize](https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180) and [CWE-175: Improper Handling of Mixed Encoding.](https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-175/README.md) This rule showcases capturing the root cause by untrusted source its original binary without compromising the logging system for forensics.
+Mixed encoding can lead to unexpected results and become a root cause for attacks as showcased in [pyscg-0044: Validate Before Canonicalize](../pyscg-0044/README.md) and [pyscg-0043: Handle Mixed Character Encoding](../pyscg-0043/README.md) This rule showcases capturing the root cause by untrusted source its original binary without compromising the logging system for forensics.
 
 > [!CAUTION]
 > Processing any type of forensic data requires an environment that is sealed off to an extent that prevents any exploit from reaching other systems, including hardware!
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-838/compliant01.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0046/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-838/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0046/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-838/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0046/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-838/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/02_encoding_and_strings/pyscg-0046/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339/README.md b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0001/README.md
similarity index 96%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339/README.md
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0001/README.md
index 3586a513..570022cc 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0001/README.md
@@ -1,4 +1,4 @@
-# CWE-1339: Insufficient Precision or Accuracy of a Real Number
+# pyscg-0001: Control Numeric Precision
 
 Avoid floating-point and use integers or the `decimal` module to ensure precision in applications that require high accuracy, such as in financial or banking computations.
 
@@ -110,4 +110,5 @@ print(
 |:---|:---|
 |[Bloch 2008]|Item 48, "Avoid `float` and `double` If Exact Answers Are Required"|
 |[Bloch 2005]|Puzzle 2, "Time for a Change"|
+
 |[IEEE 754]||
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339/compliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0001/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0001/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339/compliant02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0001/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0001/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0001/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0001/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/README.md b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/README.md
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/README.md
index 9f6aa517..faece712 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/README.md
@@ -1,4 +1,4 @@
-# CWE-191, Integer Underflow (Wrap or Wraparound)
+# pyscg-0002: Handle Integer Overflow
 
 Ensure that integer overflow is properly handled in order to avoid unexpected behavior. Python data types can be divided into two categories:
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/compliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/compliant02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/compliant03.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/compliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/compliant03.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/compliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/noncompliant03.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/noncompliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-191/noncompliant03.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0002/noncompliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/README.md b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/README.md
similarity index 95%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/README.md
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/README.md
index 488aa95b..f770a69d 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/README.md
@@ -1,4 +1,4 @@
-# CWE-1335: Promote readability and compatibility by using mathematical written code with arithmetic operations instead of bit-wise operations
+# pyscg-0003: Use Arithmetic Over Bitwise Operations
 
 Avoid using bitwise operations for calculations, write math as math instead to ensure code clarity, compatibility and maintainability.
 
@@ -104,7 +104,7 @@ The statement in `compliant01.py` clarifies the programmer's intention.
 print(8 * 4 + 10)
 ```
 
-It is recommended by *[CWE-191, Integer Underflow (Wrap or Wraparound)](../../CWE-191/README.md)* to also check for under or overflow.
+It is recommended by *[pyscg-0002: Handle Integer Overflow](../pyscg-0002/README.md)* to also check for under or overflow.
 
 ## Non-compliant Code Example (Right Shift)
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/compliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/compliant02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/example01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/example01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/example02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/example02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/example02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/example02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/README.md b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/README.md
similarity index 94%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/README.md
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/README.md
index 968a63b1..04de3bf6 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/README.md
@@ -1,8 +1,8 @@
-# CWE-197: Numeric Truncation Error
+# pyscg-0004: Use Integer Loop Counters
 
 Ensure to have predictable outcomes in loops by using int instead of `float` variables as a counter.
 
-Floating-point arithmetic can only represent a finite subset of real numbers [[IEEE Std 754-2019](https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8766229)], such as `0.555....` represented by `0.5555555555555556` also discussed in [CWE-1339: Insufficient Precision or Accuracy of a Real Number](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1339). Code examples in this rule are based on [Albing and Vossen, 2017].
+Floating-point arithmetic can only represent a finite subset of real numbers [[IEEE Std 754-2019](https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8766229)], such as `0.555....` represented by `0.5555555555555556` also discussed in [pyscg-0001: Control Numeric Precision](../pyscg-0001/README.md). Code examples in this rule are based on [Albing and Vossen, 2017].
 
 Side effects of using `float` as a counter is demonstrated in `example01.py` showcasing that calculating `0.1 + 0.2` does not end up as `0.3`.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/compliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/compliant02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/example01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/example01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/example02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/example02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/example02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/example02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0004/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/README.md b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/README.md
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/README.md
index bb06fc46..af37bb53 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/README.md
@@ -1,4 +1,4 @@
-# CWE-197: Control rounding when converting to less precise numbers
+# pyscg-0005: Control Rounding Behavior
 
 While defensive coding requires enforcing types, it is important to make conscious design decisions on how conversions are rounded.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/compliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/compliant02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/example01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/example01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/example02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/example02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/example02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/example02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0005/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/README.md b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0006/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/README.md
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0006/README.md
index dc86d489..38c0bd47 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0006/README.md
@@ -1,4 +1,4 @@
-# CWE-681: Incorrect Conversion between Numeric Types
+# pyscg-0006: Avoid Float String Comparisons
 
 String representations of floating-point numbers must not be compared or inspected outside of specialized modules such as `decimal` or `math`.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/compliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0006/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0006/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0006/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0006/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/01/README.md b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0007/README.md
similarity index 94%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/01/README.md
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0007/README.md
index 503acef0..2f7327b9 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/01/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0007/README.md
@@ -1,4 +1,4 @@
-# CWE-681: Avoid an uncontrolled loss of precision when passing floating-point literals to a Decimal constructor
+# pyscg-0007: Avoid Float Literals
 
 When working with decimal numbers in Python, using floating-point literals as input to the `Decimal` constructor can lead to unintended imprecision due to the limitations of `IEEE 754` [Wikipedia 2025](https://en.wikipedia.org/wiki/IEEE_754) floating-point representation; therefore, to ensure accurate decimal representation, it is advisable to avoid using floating-point literals.
 
@@ -50,4 +50,5 @@ print(Decimal("0.45"))
 |||
 |:---|:---|
 |[Wikipedia 2025](https://en.wikipedia.org)|IEEE 754 [online]. Available from: [https://en.wikipedia.org/wiki/IEEE_754](https://en.wikipedia.org/wiki/IEEE_754)|
+
 |[Python docs](https://docs.python.org/3/)|decimal — Decimal fixed-point and floating-point arithmetic [online]. Available from: [https://docs.python.org/3/library/decimal.html](https://docs.python.org/3/library/decimal.html) [accessed 2 February 2025]|
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/01/compliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0007/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/01/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0007/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/01/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0007/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-681/01/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0007/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/README.md b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/README.md
similarity index 96%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/README.md
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/README.md
index d35a4839..56d53c6f 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/README.md
@@ -1,4 +1,4 @@
-# CWE-1335: Incorrect Bitwise Shift of Integer
+# pyscg-0053: Handle Bitwise Shifts Safely
 
 Avoid mixing bitwise shifts with arithmetic operations, instead, use clear mathematical expressions instead to maintain predictable behavior, readability, and compatibility.
 
@@ -166,7 +166,7 @@ print("Will never reach here")
 
 ## Compliant Solution
 
-Bit-shifting is an optimization pattern that works better for languages closer to the CPU than Python. Math in Python is better done by arithmetical functions in Python as stated by *CWE-1335: Promote readability and compatibility by using mathematical written code with arithmetic operations instead of bit-wise operations* [[OpenSSF Secure Coding in Python 2025]](https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/README.md).
+Bit-shifting is an optimization pattern that works better for languages closer to the CPU than Python. Math in Python is better done by arithmetical functions in Python as stated by *CWE-1335: Promote readability and compatibility by using mathematical written code with arithmetic operations instead of bit-wise operations* [[pyscg-0003: Use Arithmetic Over Bitwise Operations]](../pyscg-0003/README.md).
 Understanding `ctypes` or `C` requires understanding the *CERT C Coding Standard* [[SEI CERT C 2025]](https://www.securecoding.cert.org/confluence/display/seccode/CERT+C+Coding+Standard)and setting boundaries manually in Python.
 
 ## Automated Detection
@@ -181,7 +181,7 @@ Not available
 <a href="https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python">[OpenSSF Secure Coding in Python 2025]</a>
 </td>
 <td>
-<a href="https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/01/README.md">CWE-1335: Promote readability and compatibility by using mathematical written code with arithmetic operations instead of bit-wise operations</a>
+<a href="https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0003/README.md">pyscg-0003: Use Arithmetic Over Bitwise Operations</a>
 </td>
 </tr>
 <tr>
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/example01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/example01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/example02.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/example02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/example02.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/example02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/example03.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/example03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/example03.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/example03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-682/CWE-1335/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/03_numbers/pyscg-0053/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-134/README.md b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0008/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-134/README.md
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0008/README.md
index 79454c64..e42d9d87 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-134/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0008/README.md
@@ -1,4 +1,4 @@
-# CWE-134: Use of Externally-Controlled Format String
+# pyscg-0008: Prevent Format String Injection
 
 Ensure that all format string functions are passed a static string which cannot be controlled by the user [[MITRE 2023]](https://cwe.mitre.org/data/definitions/134.html)
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-134/compliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0008/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-134/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0008/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-134/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0008/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-134/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0008/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-78/README.md b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0009/README.md
similarity index 95%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-78/README.md
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0009/README.md
index bd2ccf8c..63f481bf 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-78/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0009/README.md
@@ -1,4 +1,4 @@
-# CWE-78: Improper Neutralization of Special Elements Used in an OS Command ("OS Command Injection")
+# pyscg-0009: Prevent OS Command Injection
 
 Avoid input from untrusted sources to be used directly as part of an OS command and use specialized Python modules where possible instead.
 
@@ -31,7 +31,7 @@ Any variation of using input from a lesser trusted source as part of a command l
 
 * *CWE-184: Incomplete List of Disallowed Input.*
 * *CWE-209: Generation of Error Message Containing Sensitive Information.*
-* *[CWE-501: Trust Boundary Violation](https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-501/README.md)*
+* *[pyscg-0040: Respect Trust Boundaries](../../01_introduction/pyscg-0040/README.md)*
 
 ## Non-Compliant Code Example (Read Only)
 
@@ -75,7 +75,7 @@ The `FileOperations().list_dir()` method allows an attacker to add commands via
 
 The attack surface increases if a user is also allowed to upload or create files or folders.
 
-The `noncompliant02.py` example demonstrates the injection via file or folder name that is created prior to using the `list_dir()` method. We assume here that an untrusted user is allowed to create files or folders named `& calc.exe or ;ps aux` as part of another service such as upload area, submit form, or as a result of a zip-bomb as per *[CWE-409: Improper Handling of Highly Compressed Data](../../CWE-664/CWE-409/README.md) (Data Amplification)*. Encoding issues as described in *[CWE-180: Incorrect Behavior Order: Validate Before Canonicalize](../CWE-180/README.md)* must also be considered.
+The `noncompliant02.py` example demonstrates the injection via file or folder name that is created prior to using the `list_dir()` method. We assume here that an untrusted user is allowed to create files or folders named `& calc.exe or ;ps aux` as part of another service such as upload area, submit form, or as a result of a zip-bomb as per *[pyscg-0012: Handle Data Amplification](../pyscg-0012/README.md)*. Encoding issues as described in *[pyscg-0044: Validate Before Canonicalize](../../02_encoding_and_strings/pyscg-0044/README.md)* must also be considered.
 
 The issue occurs when mixing shell commands with data from a lesser trusted source.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-78/compliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0009/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-78/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0009/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-78/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0009/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-78/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0009/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-78/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0009/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-78/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0009/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-89/README.md b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0010/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-89/README.md
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0010/README.md
index da69d878..8cdd2504 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-89/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0010/README.md
@@ -1,4 +1,4 @@
-# CWE-89: Improper Neutralization of Special Elements used in an SQL Command ('SQL Injection')
+# pyscg-0010: Prevent SQL Injection
 
 To prevent SQL injections, use input sanitization and parameterized queries instead of `executescript()`.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-89/compliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0010/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-89/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0010/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-89/image01.webp b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0010/image01.webp
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-89/image01.webp
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0010/image01.webp
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-89/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0010/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-89/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0010/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/README.md b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/README.md
similarity index 94%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/README.md
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/README.md
index e5e3f2ad..1177e052 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/README.md
@@ -1,7 +1,7 @@
-# CWE-843: Access of Resource Using Incompatible Type ('Type Confusion')
+# pyscg-0011: Prevent Type Confusion
 
 When operating on unsigned values coming from external sources, such as `C` or `C++` applications, they should be unpacked using variable types that can represent their entire value range.
-This rule is related to [CWE-197: Control rounding when converting to less precise numbers](https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-197/01/README.md).
+This rule is related to [pyscg-0005: Control Rounding Behavior](../../03_numbers/pyscg-0005/README.md).
 
 The scenario in `example01.py` demonstrates what can go wrong when Python needs to interact with `C` or `C++` data types using the `struct` module [[Python docs](https://docs.python.org/3/library/struct.html)]. This can be either over the network, via file, or an interaction with the operating system. A file or stream is simulated with `io.BytesIO`.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/compliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/example01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/example01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/image01.png b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/image01.png
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/image01.png
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/image01.png
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-843/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0011/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/README.md b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/README.md
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/README.md
index 446e7f5a..99e354a7 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/README.md
@@ -1,10 +1,10 @@
-# CWE-409: Improper Handling of Highly Compressed Data (Data Amplification)
+# pyscg-0012: Handle Data Amplification
 
 Prevent slip and bomb attacks when decompressing and unpacking compressed data such as `ZIP`, `TAR.GZ`, `JAR`, `WAR`, `RPM`  or `DOCX`.
 
 Zip is used reprehensively in this rule for all compression formats.
 
-Zip Slip, or directory traversal attacks, use files with a relative path such as `../../../../../bin/bash` or full path `/bin/bash` in order to extract malicious code into an unwanted location [[2018  Snyk](https://snyk.io/blog/zip-slip-vulnerability/)]. Zip slip attacks can be prevented by sanitizing path names as described in _[CWE-180: Incorrect behavior order: Validate before Canonicalize](https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-180/README.md)_.
+Zip Slip, or directory traversal attacks, use files with a relative path such as `../../../../../bin/bash` or full path `/bin/bash` in order to extract malicious code into an unwanted location [[2018  Snyk](https://snyk.io/blog/zip-slip-vulnerability/)]. Zip slip attacks can be prevented by sanitizing path names as described in _[pyscg-0044: Validate Before Canonicalize](../../02_encoding_and_strings/pyscg-0044/README.md)_.
 
 Zip bomb attacks try to overload a system that tries to unpack it for a denial-of-service attack by either containing:
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/compliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/example01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/example01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-409/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0012/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-426/README.md b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0013/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-426/README.md
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0013/README.md
index b4e67387..e302d5e6 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-426/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0013/README.md
@@ -1,4 +1,4 @@
-# CWE-426: Untrusted Search Path
+# pyscg-0013: Secure Search Paths
 
 In an environment where an untrusted or less trusted entity can modify the environment variables, consider validating hash-based byte code [Python 2023 Command line and environment].
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-426/compliant01.bash b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0013/compliant01.bash
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-426/compliant01.bash
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0013/compliant01.bash
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-426/example01.bash b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0013/example01.bash
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-426/example01.bash
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0013/example01.bash
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-426/noncompliant01.bash b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0013/noncompliant01.bash
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-426/noncompliant01.bash
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0013/noncompliant01.bash
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-502/README.md b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0023/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-502/README.md
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0023/README.md
index fb2e50bc..beca5a0e 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-502/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0023/README.md
@@ -1,4 +1,4 @@
-# CWE-502: Deserialization of Untrusted Data
+# pyscg-0023: Secure Deserialization
 
 Even if data has been created from a trusted source, we need to verify that it has not been tampered with during transport.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-502/compliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0023/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-502/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0023/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-502/example01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0023/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-502/example01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0023/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-502/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0023/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-502/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0023/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-184/README.md b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0047/README.md
similarity index 94%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-184/README.md
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0047/README.md
index 33aa7879..312100e0 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-184/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0047/README.md
@@ -1,4 +1,4 @@
-# CWE-184: Incomplete List of Disallowed Input
+# pyscg-0047: Use Allow Lists Over Deny Lists
 
 Avoid Incomplete 'deny lists' that can lead to security vulnerabilities such as cross-site scripting (XSS) by using 'allow lists' instead.
 
@@ -6,7 +6,7 @@ Avoid Incomplete 'deny lists' that can lead to security vulnerabilities such as
 
 The `noncompliant01.py` code demonstrates the difficult handling of exclusion lists in a multi language support use case. `UTF-8` has __1,112,064__ mappings between `8-32` bit values and printable characters such as `生` known as "code points".
 
-The `noncompliant01.py` `filterString()` method attempts to search for disallowed inputs and fails to find the `script` tag due to the non-English character `生`  in `<script生>`. Failure to filter such strings could lead to Cross-Site Scripting (XSS) injection, as per [CWE-182: Collapse of Data into Unsafe Value](../CWE-182/README.md)
+The `noncompliant01.py` `filterString()` method attempts to search for disallowed inputs and fails to find the `script` tag due to the non-English character `生`  in `<script生>`. Failure to filter such strings could lead to Cross-Site Scripting (XSS) injection, as per [pyscg-0045: Enforce Consistent Encoding](../../02_encoding_and_strings/pyscg-0045/README.md)
 
 *[noncompliant01.py](noncompliant01.py):*
 
@@ -57,7 +57,7 @@ for name in names:
 
 ## Compliant Solution
 
-The `compliant01.py` uses an allow list instead of a deny list and prevents the use of unwanted characters by raising an exception even without canonicalization. The missing canonicalization in `compliant01.py` according to [CWE-180: Incorrect Behavior Order: Validate Before Canonicalize](../../CWE-707/CWE-180) must be added in order to make logging or displaying them safe!
+The `compliant01.py` uses an allow list instead of a deny list and prevents the use of unwanted characters by raising an exception even without canonicalization. The missing canonicalization in `compliant01.py` according to [pyscg-0044: Validate Before Canonicalize](../../02_encoding_and_strings/pyscg-0044/README.md) must be added in order to make logging or displaying them safe!
 
 *[compliant01.py](compliant01.py):*
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-184/compliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0047/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-184/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0047/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-184/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0047/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-184/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/04_neutralization/pyscg-0047/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-397/README.md b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0014/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-397/README.md
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0014/README.md
index 2cbc1896..c47d06f0 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-397/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0014/README.md
@@ -1,4 +1,4 @@
-# CWE-397: Declaration of Throws for Generic Exception
+# pyscg-0014: Avoid Generic Exception Declarations
 
 Avoid raising exceptions that aren't informative on specific errors.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-397/compliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0014/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-397/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0014/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-397/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0014/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-397/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0014/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/README.md b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/README.md
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/README.md
index 194a7bfe..447facc0 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/README.md
@@ -1,4 +1,4 @@
-# CWE-755: Improper Handling of Exceptional Conditions
+# pyscg-0015: Handle Exceptional Conditions
 
 Always catch and explicitly handle exceptions, then respond, log or recover appropriately instead of letting operations fail silently.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/compliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/compliant02.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/noncompliant03.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/noncompliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/noncompliant03.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0015/noncompliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/README.md b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0016/README.md
similarity index 90%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/README.md
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0016/README.md
index c93bea7a..d270569e 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0016/README.md
@@ -1,4 +1,4 @@
-# CWE-390: Detection of Error Condition without Action
+# pyscg-0016: Act on Error Conditions
 
 Allow exceptions to bubble up and handle exceptions at the right level in the stack.
 
@@ -23,7 +23,7 @@ In Python `Exception` extends from `BaseException`and a bare `except` will catch
 
 For instance, catching a bare `except` causes a user to be unable to stop a script via `CTRL+C`, due to the base `except` catching all exceptions. In comparison, catching `except Exception` allows a `KeyboardInterrupt` to be the Python interpreter itself or other parts of the code. This is due to `KeyboardInterrupt` extending `BaseException` and not `Exception`.
 
-Note that using `except Exception` is still too broad as per [CWE-755: Improper Handling of Exceptional Conditions](https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-755/README.md) and that a more specific exception handling is preferred.
+Note that using `except Exception` is still too broad as per [pyscg-0015: Handle Exceptional Conditions](../pyscg-0015/README.md) and that a more specific exception handling is preferred.
 
 The `noncompliant01.py` code demonstrates a bare `except` on a `ZeroDivisionError` and must be run on the command line in order to experience the issue.
 
@@ -140,7 +140,7 @@ The following two exceptions, highlighted in [SEI Cert's Oracle Coding Standard
 
 |||
 |:---|:---|
-|[MITRE](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python)|[CWE-209: Generation of Error Message Containing Sensitive Information](https://cwe.mitre.org/data/definitions/209.html)|
+|[MITRE](https://cwe.mitre.org/)|[CWE-209: Generation of Error Message Containing Sensitive Information](https://cwe.mitre.org/data/definitions/209.html)|
 |[SEI CERT Oracle Coding Standard for Java](https://wiki.sei.cmu.edu/confluence/display/java/SEI+CERT+Oracle+Coding+Standard+for+Java)|[ERR00-J. Do not suppress or ignore checked exceptions](https://wiki.sei.cmu.edu/confluence/display/java/ERR00-J.+Do+not+suppress+or+ignore+checked+exceptions)|
 |[MITRE CWE Base](http://cwe.mitre.org/)|[CWE-703](https://cwe.mitre.org/data/definitions/703.html), Improper Check or Handling of Exceptional Conditions|
 |[MITRE CWE Pillar](http://cwe.mitre.org/)|[CWE-390](http://cwe.mitre.org/data/definitions/390.html), Detection of Error Condition without Action|
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/compliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0016/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0016/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/example01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0016/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/example01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0016/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0016/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0016/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/README.md b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/README.md
similarity index 96%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/README.md
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/README.md
index 29b70a87..6a99486d 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/README.md
@@ -1,4 +1,4 @@
-# CWE-230: Improper Handling of Missing Values
+# pyscg-0017: Handle Missing Values
 
 Detect and handle missing numberic values explicitly, either by removing, validating or converting them, before performing comparisons, sorting, or statistics, in order to avoid surprising or undefined behaviour.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/compliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/compliants02.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/compliants02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/compliants02.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/compliants02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/example01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/example01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-230/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0017/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-754/README.md b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0018/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-754/README.md
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0018/README.md
index 6b04df50..08f56cb9 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-754/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0018/README.md
@@ -1,4 +1,4 @@
-# CWE-754: Improper Check for Unusual or Exceptional Conditions - Float
+# pyscg-0018: Check Float Exceptional Conditions
 
 Ensure to have handling for exceptional floating-point values.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-754/compliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0018/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-754/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0018/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-754/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0018/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-754/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0018/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-460/README.md b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0052/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-460/README.md
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0052/README.md
index 634ce098..84c44056 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-460/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0052/README.md
@@ -1,5 +1,4 @@
-
-# CWE-460: Improper Cleanup on Thrown Exception
+# pyscg-0052: Clean Up on Exceptions
 
 Make sure that your code fully and correctly cleans up its state whenever an exception occurs to avoid unexpected state or control flow.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-460/compliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0052/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-460/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0052/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-460/example01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0052/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-460/example01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0052/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-460/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0052/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-460/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/05_exception_handling/pyscg-0052/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/README.md b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/README.md
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/README.md
index 41319551..fbb5f072 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/README.md
@@ -1,4 +1,4 @@
-# CWE-532: Insertion of Sensitive Information into Log File
+# pyscg-0019: Avoid Sensitive Data in Logs
 
 Do not log any sensitive information such as passwords or credit card numbers. Encrypt or anonymize personal information such as user names, and date of birth in plain text.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/compliant01.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/compliant02.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/example01.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/example01.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0019/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-778/README.md b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0020/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-778/README.md
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0020/README.md
index 882455d9..284c4140 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-778/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0020/README.md
@@ -1,4 +1,4 @@
-# CWE-778: Insufficient Logging
+# pyscg-0020: Ensure Sufficient Logging
 
 Ensure you have sufficient logging in order to adequately record important events within an application and/or system.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-778/compliant01.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0020/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-778/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0020/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-778/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0020/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-778/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0020/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-489/README.md b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0021/README.md
similarity index 94%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-489/README.md
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0021/README.md
index 6b63543a..94a1650f 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-489/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0021/README.md
@@ -1,4 +1,4 @@
-# CWE-489: Active Debug Code
+# pyscg-0021: Remove Debug Code
 
 Keep design tooling in separate packages from the actual product and supply useful logging.
 
@@ -39,7 +39,7 @@ Not knowing that a product must be deployed differently in production than in st
 |[MITRE CWE](http://cwe.mitre.org/)|Pillar: [CWE-710: Improper Adherence to Coding Standards (4.13) (mitre.org)](https://cwe.mitre.org/data/definitions/710.html)|
 |[MITRE CWE](http://cwe.mitre.org/)|Base: [CWE-489: Active Debug Code (4.13) (mitre.org)](https://cwe.mitre.org/data/definitions/489.html)|
 |[SEI CERT Coding Standard for Java](https://wiki.sei.cmu.edu/confluence/display/java/SEI+CERT+Oracle+Coding+Standard+for+Java)|[ENV05-J. Do not deploy an application that can be remotely monitored](https://wiki.sei.cmu.edu/confluence/display/java/ENV05-J.+Do+not+deploy+an+application+that+can+be+remotely+monitored)|
-|[Python - Secure Coding One Stop Shop](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python/)|[CWE-532: Insertion of Sensitive Information into Log File](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-532/README.md)|
+|[Python - Secure Coding One Stop Shop](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python/)|[pyscg-0019: Avoid Sensitive Data in Logs](../pyscg-0019/README.md)|
 
 ## Bibliography
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-117/README.md b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0022/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-117/README.md
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0022/README.md
index 974f3dcc..027a2154 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-117/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0022/README.md
@@ -1,4 +1,4 @@
-# CWE-117: Improper Output Neutralization for Logs
+# pyscg-0022: Neutralize Log Output
 
 Ensure all untrusted data is properly neutralized or sanitized before writing to application logs.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-117/compliant01.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0022/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-117/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0022/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-117/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0022/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-707/CWE-117/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0022/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/README.md b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/README.md
similarity index 97%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/README.md
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/README.md
index 9b722db6..4091d496 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/README.md
@@ -1,7 +1,7 @@
-# CWE-209: Generation of Error Message Containing Sensitive Information
+# pyscg-0050: Avoid Sensitive Error Messages
 
 Prevent an attacker from discovering internal or sensitive system information by filtering, splitting and applying brute force prevention tactics when displaying error messages to a user.
-This rule is closely related to [CWE-532: Insertion of Sensitive Information into Log File](../CWE-532/README.md).
+This rule is closely related to [pyscg-0019: Avoid Sensitive Data in Logs](../pyscg-0019/README.md).
 
 Ensure that detailed troubleshooting and security sensitive error information can only reach authorized personnel while avoiding overload from brute force attacks.
 
@@ -178,12 +178,12 @@ The `compliant01.py` code example only demonstrates basic control over errors di
 
 Details on other best practices are only mentioned as a TODO comment such as:
 
-* [CWE-180: Incorrect Behavior Order: Validate Before Canonicalize](../../CWE-707/CWE-180/README.md)
-* [CWE-390: Detection of Error Condition without Action](../../CWE-703/CWE-390/README.md)
-* Rules related to logging ([CWE-117](../../CWE-707/CWE-117/README.md), [CWE-532](../CWE-532/README.md))
+* [pyscg-0044: Validate Before Canonicalize](../../02_encoding_and_strings/pyscg-0044/README.md)
+* [pyscg-0016: Act on Error Conditions](../../05_exception_handling/pyscg-0016/README.md)
+* Rules related to logging ([pyscg-0022: Neutralize Log Output](../pyscg-0022/README.md), [pyscg-0019: Avoid Sensitive Data in Logs](../pyscg-0019/README.md))
 * File access, log access control
 * Log level, log format in accordance with [rfc5424](https://www.rfc-editor.org/rfc/rfc5424)
-* [CWE-778: Insufficient Logging](../../CWE-693/CWE-778/README.md)
+* [pyscg-0020: Ensure Sufficient Logging](../pyscg-0020/README.md)
 
 Useful internal logging must be resilient against brute force attacks currently not covered in `compliant01.py`.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/compliant01.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/noncompliant03.py b/docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/noncompliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-209/noncompliant03.py
rename to docs/Secure-Coding-Guide-for-Python/06_logging/pyscg-0050/noncompliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/compliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/example01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/example01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/image01.png b/docs/Secure-Coding-Guide-for-Python/07_concurrency/image01.png
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/image01.png
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/image01.png
diff --git a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/image02.png b/docs/Secure-Coding-Guide-for-Python/07_concurrency/image02.png
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/image02.png
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/image02.png
diff --git a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/noncompliant03.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/noncompliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/noncompliant03.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/noncompliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-400/README.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0024/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-400/README.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0024/README.md
index 2ca8035a..676e2270 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-400/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0024/README.md
@@ -1,4 +1,4 @@
-# CWE-400: Uncontrolled Resource Consumption
+# pyscg-0024: Control Resource Consumption
 
 Canceling the task in a thread pool only prevents it from being executed if it has not started yet. For the task to be interruptible, it must handle the `threading.Event` flag.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-400/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0024/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-400/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0024/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-400/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0024/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-400/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0024/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/README.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/README.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/README.md
index b773f2a2..82d79c30 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/README.md
@@ -1,4 +1,4 @@
-# CWE-410: Insufficient Resource Pool
+# pyscg-0025: Size Resource Pools
 
 Ensure load control during traffic bursts or Denial of Service (DoS) by using a limited amount of threads in a pool.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/compliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-410/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0025/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/README.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/README.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/README.md
index 8039d989..1aca5262 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/README.md
@@ -1,4 +1,4 @@
-# CWE-833: Deadlock
+# pyscg-0026: Prevent Deadlock
 
 Submitting tasks whose execution is dependent on other tasks submitted to the same `ThreadPoolExecutor` may result in a *thread-starvation* deadlock.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/compliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-833/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0026/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-362/README.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0027/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-362/README.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0027/README.md
index 2f24c6df..bb0c8638 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-362/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0027/README.md
@@ -1,4 +1,4 @@
-# CWE-362: Concurrent Execution Using Shared Resource with Improper Synchronization ("Race Condition")
+# pyscg-0027: Synchronize Shared Resources
 
 Ensure to implement locking mechanisms when chaining methods in a multithreaded environment to prevent unexpected results.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-362/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0027/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-362/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0027/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-362/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0027/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-362/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0027/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-584/README.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0028/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-584/README.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0028/README.md
index 064fdb91..30775c1a 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-584/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0028/README.md
@@ -1,4 +1,4 @@
-# CWE-584: Return Inside Finally Block
+# pyscg-0028: Avoid Returns in Finally
 
 Do not use `return`, `break` or `continue` statements in a try-finally block, as the exception will not be processed. The Python documentation [[Python 3.9]](https://docs.python.org/3.9/reference/compound_stmts.html#finally) notes, "If the `finally` clause executes a [`return`](https://docs.python.org/3.9/reference/simple_stmts.html#return), [`break`](https://docs.python.org/3.9/reference/simple_stmts.html#break) or [`continue`](https://docs.python.org/3.9/reference/simple_stmts.html#continue) statement, the saved exception is discarded."
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-584/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0028/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-584/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0028/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-584/compliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0028/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-584/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0028/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-584/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0028/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-584/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0028/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/README.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/README.md
similarity index 97%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/README.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/README.md
index 98fcde07..9e199260 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/README.md
@@ -1,4 +1,4 @@
-# CWE-665: Improper Initialization
+# pyscg-0029: Initialize Properly
 
 Prevent unexpected states by applying correct initialized of local objects as they remain available when a thread's resources are re-used in a thread-pool.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/compliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-665/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0029/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/README.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/README.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/README.md
index 6f686b29..9d6453e3 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/README.md
@@ -1,4 +1,4 @@
-# CWE-392: Missing Report of Error Condition
+# pyscg-0030: Report Thread Pool Errors
 
 Failure to provide a mechanism for reporting that tasks in a thread pool failed as a result of an exceptional condition can make it difficult or impossible to diagnose the problem.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/compliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/compliant03.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/compliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/compliant03.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/compliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/compliant04.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/compliant04.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/compliant04.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/compliant04.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-392/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0030/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-404/README.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0051/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-404/README.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0051/README.md
index 9810a30d..9cdf510d 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-404/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0051/README.md
@@ -1,4 +1,4 @@
-# CWE-404: Improper Resource Shutdown or Release
+# pyscg-0051: Release Resources Properly
 
 Always close resources explicitly and ensure proper cleanup even if an error occurs.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-404/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0051/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-404/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0051/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-404/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0051/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-404/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0051/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-366/README.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0054/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-366/README.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0054/README.md
index aae493f7..da4fa13b 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-366/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0054/README.md
@@ -1,4 +1,4 @@
-# CWE-366: Race Condition within a Thread
+# pyscg-0054: Prevent Thread Race Conditions
 
 In multithreaded programming, use synchronization mechanisms, such as locks, to avoid race conditions, which occur when multiple threads access shared resources simultaneously and lead to unpredictable results.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-366/compliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0054/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-366/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0054/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-366/example01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0054/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-366/example01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0054/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-366/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0054/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-366/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/pyscg-0054/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/readme.md b/docs/Secure-Coding-Guide-for-Python/07_concurrency/readme.md
similarity index 94%
rename from docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/readme.md
rename to docs/Secure-Coding-Guide-for-Python/07_concurrency/readme.md
index 87aba963..66e72a82 100644
--- a/docs/Secure-Coding-Guide-for-Python/Intro_to_multiprocessing_and_multithreading/readme.md
+++ b/docs/Secure-Coding-Guide-for-Python/07_concurrency/readme.md
@@ -2,12 +2,15 @@
 
 This page aims to explain the concepts that could be found in the following rules:
 
-- [CWE-410: Insufficient Resource Pool](../CWE-664/CWE-410/README.md)
-- [CWE-833: Deadlock](../CWE-664/CWE-833/README.md)
-- [CWE-400: Uncontrolled Resource Consumption](../CWE-664/CWE-400/README.md)
-- [CWE-392: Missing Report of Error Condition](../CWE-703/CWE-392/README.md)
-- [CWE-665: Improper Initialization](../CWE-664/CWE-665/README.md)
-- [CWE-366: Race Condition within a Thread](../CWE-691/CWE-366/README.md)
+- [pyscg-0025: Insufficient Resource Pool](pyscg-0025/README.md)
+- [pyscg-0026: Deadlock](pyscg-0026/README.md)
+- [pyscg-0024: Uncontrolled Resource Consumption](pyscg-0024/README.md)
+- [pyscg-0027: Concurrent Execution Using Shared Resource with Improper Synchronization (Race Condition)](pyscg-0027/README.md)
+- [pyscg-0028: Return Inside Finally Block](pyscg-0028/README.md)
+- [pyscg-0030: Missing Report of Error Condition](pyscg-0030/README.md)
+- [pyscg-0029: Improper Initialization](pyscg-0029/README.md)
+- [pyscg-0051: Improper Resource Shutdown or Release](pyscg-0051/README.md)
+- [pyscg-0054: Race Condition within a Thread](pyscg-0054/README.md)
 
 ## What is Multithreading in Python - Multithreading vs Multiprocessing
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/README.md b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/README.md
similarity index 96%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/README.md
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/README.md
index 6c23351f..eee45f0d 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/README.md
@@ -1,4 +1,4 @@
-# CWE-1095: Loop Condition Value Update within the Loop
+# pyscg-0031: Avoid Loop Condition Updates
 
 Promote predictable and secure `for` loops by iterating over a copy or new collection item as described in 4.2 `for` Statements [Python 3.9 2024](https://docs.python.org/3.9/tutorial/controlflow.html#for-statements).
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/compliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/compliant02.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/compliant03.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/compliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/compliant03.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/compliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/noncompliant03.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/noncompliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1095/noncompliant03.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0031/noncompliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/README.md b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/README.md
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/README.md
index e121eaf8..e2eeebfb 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/README.md
@@ -1,4 +1,4 @@
-# CWE-1109: Use of Same Variable for Multiple Purposes
+# pyscg-0032: Use Variables for Single Purpose
 
 Avoid reusing names of variables, functions, classes, built-in functions, packages, or standard Python modules
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/compliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/compliant02.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-710/CWE-1109/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0032/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-697/CWE-595/README.md b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0033/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-697/CWE-595/README.md
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0033/README.md
index af5c7fa8..401c4152 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-697/CWE-595/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0033/README.md
@@ -1,4 +1,4 @@
-# CWE-595: Comparison of Object References Instead of Object Contents
+# pyscg-0033: Compare Object Contents
 
 Prevent unexpected results by knowing the differences between comparison operators such as `==` and `is`.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-697/CWE-595/compliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0033/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-697/CWE-595/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0033/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-697/CWE-595/example01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0033/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-697/CWE-595/example01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0033/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-697/CWE-595/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0033/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-697/CWE-595/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0033/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/README.md b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/README.md
similarity index 97%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/README.md
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/README.md
index dc6339b9..39cbe49d 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/README.md
@@ -1,4 +1,4 @@
-# CWE-476: NULL Pointer Dereference
+# pyscg-0034: Check for None Values
 
 Avoiding NULL Pointer Dereference is crucial for preventing runtime errors, and ensuring that your code executes successfully.
 
@@ -8,7 +8,7 @@ Avoiding NULL Pointer Dereference is crucial for preventing runtime errors, and
 * Check the object is an array before accessing or modifying its elements.
 * Raise only exceptions that properly inherit from the BaseException class, never raise "None".
 
-If the data originates from a lesser trusted source, verifying that objects are not None becomes a mandatory security measure to prevent potential vulnerabilities such as unauthorized access or unexpected behavior. However, when dealing with data from trusted and well-controlled sources, the primary concern shifts from a security one, to more of a stability issue as per [CWE-390](https://github.com/ossf/wg-best-practices-os-developers/blob/main/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-390/README.md).
+If the data originates from a lesser trusted source, verifying that objects are not None becomes a mandatory security measure to prevent potential vulnerabilities such as unauthorized access or unexpected behavior. However, when dealing with data from trusted and well-controlled sources, the primary concern shifts from a security one, to more of a stability issue as per [pyscg-0016: Act on Error Conditions](../../05_exception_handling/pyscg-0016/README.md).
 
 ## Non-Compliant Code Example - Verify that the object is not None before accessing or modifying its fields
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/compliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/compliant02.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/compliant03.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/compliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/compliant03.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/compliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/noncompliant03.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/noncompliant03.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-476/noncompliant03.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0034/noncompliant03.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-459/README.md b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0035/README.md
similarity index 97%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-459/README.md
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0035/README.md
index 21ac6a8a..aa69874e 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-459/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0035/README.md
@@ -1,4 +1,4 @@
-# CWE-459: Incomplete Cleanup
+# pyscg-0035: Complete Resource Cleanup
 
 Leftover temporary files not properly cleaned up after the completion of any script, can lead to resource exhaustion and disable a service.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-459/compliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0035/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-459/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0035/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-459/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0035/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-459/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0035/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-459/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0035/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-664/CWE-459/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0035/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/README.md b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/README.md
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/README.md
index 1ee26926..5fd2d2ef 100755
--- a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/README.md
@@ -1,4 +1,4 @@
-# CWE-252: Unchecked Return Value
+# pyscg-0036: Check Return Values
 
 Return values of methods and functions should always be checked to ensure operations have been performed correctly.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/compliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/compliant02.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/compliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/compliant02.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/compliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/noncompliant02.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/noncompliant02.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-703/CWE-252/noncompliant02.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0036/noncompliant02.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-617/README.md b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0037/README.md
similarity index 99%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-617/README.md
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0037/README.md
index 0b1cbbca..8d2e4496 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-617/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0037/README.md
@@ -1,4 +1,4 @@
-# CWE-617: Reachable Assertion
+# pyscg-0037: Avoid Reachable Assertions
 
 Assertions are a useful developer tool, but they cannot be relied upon to be present in a production environment. Incorrect function arguments should be handled by an appropriate exception.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-617/compliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0037/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-617/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0037/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-617/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0037/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-691/CWE-617/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/08_coding_standards/pyscg-0037/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-330/README.md b/docs/Secure-Coding-Guide-for-Python/09_cryptography/pyscg-0038/README.md
similarity index 98%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-330/README.md
rename to docs/Secure-Coding-Guide-for-Python/09_cryptography/pyscg-0038/README.md
index 1ee5dcb6..835ba553 100644
--- a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-330/README.md
+++ b/docs/Secure-Coding-Guide-for-Python/09_cryptography/pyscg-0038/README.md
@@ -1,4 +1,4 @@
-# CWE-330: Use of Insufficiently Random Values
+# pyscg-0038: Use Secure Random Values
 
 When programming cryptographic functions ensure to use a Pseudo-Random Number Generator (PRNG) source that is random enough to be suitable for encryption.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-330/compliant01.py b/docs/Secure-Coding-Guide-for-Python/09_cryptography/pyscg-0038/compliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-330/compliant01.py
rename to docs/Secure-Coding-Guide-for-Python/09_cryptography/pyscg-0038/compliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-330/example01.py b/docs/Secure-Coding-Guide-for-Python/09_cryptography/pyscg-0038/example01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-330/example01.py
rename to docs/Secure-Coding-Guide-for-Python/09_cryptography/pyscg-0038/example01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-330/noncompliant01.py b/docs/Secure-Coding-Guide-for-Python/09_cryptography/pyscg-0038/noncompliant01.py
similarity index 100%
rename from docs/Secure-Coding-Guide-for-Python/CWE-693/CWE-330/noncompliant01.py
rename to docs/Secure-Coding-Guide-for-Python/09_cryptography/pyscg-0038/noncompliant01.py
diff --git a/docs/Secure-Coding-Guide-for-Python/CONTRIBUTING.md b/docs/Secure-Coding-Guide-for-Python/CONTRIBUTING.md
index 0d119a0a..ca94c24b 100644
--- a/docs/Secure-Coding-Guide-for-Python/CONTRIBUTING.md
+++ b/docs/Secure-Coding-Guide-for-Python/CONTRIBUTING.md
@@ -2,9 +2,21 @@
 
 This guide provides an overview of how you can help, the standards we adhere to, and the steps to get your contributions reviewed for the subpages in [wg-best-practices-os-developers/docs/Secure-Coding-Guide-for-Python/](https://github.com/ossf/wg-best-practices-os-developers/tree/main/docs/Secure-Coding-Guide-for-Python/).
 
-## Code of Conduct
+## Mission Statement
 
-Please read and adhere to our [Code of Conduct](https://github.com/ossf/wg-best-practices-os-developers/blob/main/code-of-conduct.md). We are committed to creating a welcoming and inclusive environment for all contributors.
+The goal is to provide a learning resource for secure coding in `Python` that is as comprehensive as those available for `Java`, `C`, `C++`, or `Go`.
+
+Similar to Python itself, the learning shall be as fun as possible by providing:
+
+* Working code examples
+* Usable in a local coding programming IDE or online either CLI or web.
+* Independence of any specific web framework or module.
+* Documentation free of bias towards a single commercial vendor of security tooling
+* Short concise and way below 40+ hours of other secure coding resources for a full study.
+* Overview table of rule vs risk rating.
+* Evidence based approach on risk rating.
+
+Join us to explore how this resource can become an indispensable part of your secure coding toolkit
 
 ## Getting Started
 
@@ -18,31 +30,9 @@ Please read and adhere to our [Code of Conduct](https://github.com/ossf/wg-best-
 
 3. Set up the development environment with a Python environment >= `3.9` and a `Markdown` reader.
 
-## How to Contribute
-
-We welcome contributions in many forms—whether it’s fixing a bug or typo, improving the readability of the guide, adding a new code example, or creating entirely new pages to cover missing material. Before you start, please check for existing issues.
-
-Become part of the reviewers for upcoming pull requests (PRs) by joining slack and our bi-weekly meetings.
-
-Steps to join #secure-coding-guide-for-python slack channel as per [Beginner to builder steps](https://openssf.org/blog/2025/08/08/from-beginner-to-builder-understanding-openssf-community-and-working-groups/):
-
-1) Request access [https://slack.openssf.org/](https://slack.openssf.org/)
-2) in the search bar at the top: `/join secure-coding-guide-for-python`
-
-Become part of organizing bigger changes via our bi-weekly online meeting, see details in:
-
-* [Meeting Notes](https://docs.google.com/document/d/1u1gJMtOz-P5Z71B-vKKigzTbIDIS-bUNgNIcfnW4r-k)
-
-It is helpful to know:
-
-* Why we do this, as explained in our mission statement.
-* Our documentation style
-* Code standards, Python and Markdown linters and such
-* Folder, file layout and naming conventions
-
 ## Target Audience
 
-Target audience is new designers, security researchers and anyone teaching secure coding.
+Target audience are new designers, security researchers, machines and anyone teaching secure coding.
 
 ### New designers
 
@@ -50,7 +40,13 @@ This resource provides a baseline of knowledge for self-study while learning Pyt
 
 ### Security Researchers
 
-The noncompliantXX.py code examples are designed to allow throwing analysis tools at them. The code is split into a 'defend' and 'attack' section via:
+The overview table listing the most prominent CVEs allows to gain understanding of CVSS rating and blind spots in relation to EPSS frequency ratings.
+
+### Machines
+
+Ai's, LLMS, and secure code analysis tool can either be trained or tested with the code examples.
+
+The `noncompliantXX.py` code examples are designed to allow throwing analysis tools at them. The code is split into a 'defend' and 'attack' section via:
 
 ```py
 ...
@@ -60,31 +56,39 @@ The noncompliantXX.py code examples are designed to allow throwing analysis tool
 ...
 ```
 
-The attack section is not suitable for automated analysis and would need to be stripped or ignored.
-
-The `compliantXX.py` code examples are not suitable for automated analysis as they address only one issue or CWE, they do NOT supply end to end secure code.
+The attack section is not suitable for automated analysis and would need to be stripped or ignored. Language based solutions must also rename the `noncompliantXX.py` and strip all comments to avoid language based bias.
 
-The overview table listing the most prominent CVEs allows to gain understanding of CVSS rating and blind spots in relation to EPSS frequency ratings. There is plenty that can be improved on this subject.
+The `compliantXX.py` code examples are not suitable for automated analysis as they address only one issue, they do NOT supply end to end secure code!
 
 ### Teaching secure coding
 
-Although not specifically designed as a teaching resource, the material provided can be effectively used in educational settings.
+Provided content is designed for self learning, the open source license invites anyone using it as part of their own teaching.
 
-## Mission Statement
+## How to Contribute
 
-The goal is to provide a learning resource for secure coding in `Python` that is as comprehensive as those available for `Java`, `C`, `C++`, or `Go`.
+We welcome contributions in many forms—whether it’s fixing a bug or typo, improving the readability of the guide, adding a new code example, or creating entirely new pages to cover missing material. Before you start, please check for existing issues.
 
-Similar to Python itself, the learning shall be as fun as possible by providing:
+Become part of the reviewers for upcoming pull requests (PRs) by joining slack and our bi-weekly meetings.
 
-* Working code examples
-* Usable in a local coding programming IDE or online either CLI or web.
-* Independence of any specific web framework or module.
-* Documentation free of bias towards a single commercial vendor of security tooling
-* Short concise and way below 40+ hours of other secure coding resources for a full study.
-* Overview table of rule vs risk rating.
-* Evidence based approach on risk rating.
+Steps to join #secure-coding-guide-for-python slack channel as per [Beginner to builder steps](https://openssf.org/blog/2025/08/08/from-beginner-to-builder-understanding-openssf-community-and-working-groups/):
 
-Join us to explore how this resource can become an indispensable part of your secure coding toolkit
+1) Request access [https://slack.openssf.org/](https://slack.openssf.org/)
+2) in the search bar at the top: `/join secure-coding-guide-for-python`
+
+Become part of organizing bigger changes via our bi-weekly online meeting, see details in:
+
+* [Meeting Notes](https://docs.google.com/document/d/1u1gJMtOz-P5Z71B-vKKigzTbIDIS-bUNgNIcfnW4r-k)
+
+It is helpful to know:
+
+* Why we do this, as explained in our mission statement.
+* Our documentation style
+* Code standards, Python and Markdown linters and such
+* Folder, file layout and naming conventions
+
+## Code of Conduct
+
+Please read and adhere to our [Code of Conduct](https://github.com/ossf/wg-best-practices-os-developers/blob/main/code-of-conduct.md). We are committed to creating a welcoming and inclusive environment for all contributors.
 
 ## Documentation Style
 
@@ -98,77 +102,64 @@ Join us to explore how this resource can become an indispensable part of your se
 
 A template for a rule is available here: [README_TEMPLATE.md](templates/README_TEMPLATE.md) with inline documentation on each section.
 
-Each rule should have:
+## Structure Guide, from a reader perspective
 
-* At least one `noncompliant01.py` demonstrating an antipattern.
-* At least one `compliant01.py` providing a fix for the issue demonstrated in `noncompliant01.py`.
-* Be within 20 lines of code per file.
-
-## Structure Guide
-
-### From a reader perspective
+The psycg guide structure starts below `docs/Secure-Coding-Guide-for-Python` with the its main [readme.md](readme.md) showing the learning path in its main table.
+Folder on this level represent a Section such as "Introduction" in `01_introduction`.
 
-The guide is structured in two levels. The top level readme is to list all rules whilst also providing an idea of:
+The pyscg main [readme.md](readme.md) is expected to contain:
 
-* Chapter
-* Related risks
-* Available automated detection
-* Available automated correction
+* Section such as "01 Introduction"
+* Rules in that section such as "pyscg-0040"
+* Rule related base or class level CWE
+* Rule relted single representitive CVE with CVSS and EPSS rating
+* Automated detection
+* Automated correction
 
-The sublevel has an a individual rule with a single CWE where possible.
+## Structure Guide, from a author perspective
 
-> [!NOTE]
-> We are aware that CWEs are not designed as 'read throughs'. Their numbering is not designed to become a step by step guide. The [Introduction to Multithreading and Multiprocessing](Intro_to_multiprocessing_and_multithreading/readme.md) in Python is an example where we had to provide an alternative layout with three levels. Eventually we will have to shuffle the individual rules into a more suitable sequence.
-> Same CWE number with different titles will also have to be fixed at some stage.
+The sublevel from a section, such as `01_introduction`, has individual folders per rule such as `pyscg-0040`.
+A section, such as `01_introduction`, may contain a `readme.md` outlining knowledge that spans across all rules in that section.
+Each rule folder, such as `pyscg-0040`, is expected to have:
 
-### From a author perspective
+* Only one `README.md` file
+* At least one `noncompliant01.py` demonstrating an antipattern.
+* At least one `compliant01.py` providing a reasonable solution.
+* Optional `example01.py` or `example01.sh` code or `image01.png`
 
-* Top-level folders are Pillars `CWE-1000` such as `CWE-707`
-* Second-level folders are either a CWE of Base, Variant, or Class type representing one rule such as `CWE-89`
-* If multiple rules match a single CWE such as `CWE-197` we create another subfolder with a two-digit number starting at `01`
-since `00` is in the main folder.
-* Rules without a matching CWE are stored in an incrementing placeholder `XXX-000`, `XXX-001`.
-* Rules matching multiple CWEs to use the best matching one as a folder and list it at the top of its reference list
+A code example should be around 20 lines and only demonstrate countermeasures for the discussed issue. The writer can indicated requirements for a wider range of issues by leaving a comment `# TODO: verify xyz...`. Rules without working code examples might be required must be avoided.
 
-Example structure with mocked up data:
+Example structure with mocked up data below `docs/Secure-Coding-Guide-for-Python/`:
 
 ```bash
-./README.md
+# pyscg main readme:
+./readme.md
+
+# license file copies:
 ./licenses/MIT.txt
 ./licenses/CC-BY-4.0.txt
 
-./Concepts/Multithreading_Multiprocessing.md
-
-# Top level using Pillar CWE-707:
-./CWE-707/README.md
-
-# Second level representing a Rule is either a CWE of type Base, Variant or Class:
-./CWE-664/CWE-197/README.md
-./CWE-664/CWE-197/compliant01.py
-./CWE-664/CWE-197/example01.py
-./CWE-664/CWE-197/noncompliant01.py
-
-# Multiple rules matching one CWE of type Base, Variant or Class:
-./CWE-664/CWE-197/01/README.md
-./CWE-664/CWE-197/01/compliant01.py
-./CWE-664/CWE-197/01/noncompliant01.py
-
-# Rule matching no CWE of type Base, Variant, or Class:
-./CWE-707/XXX-000/README.md
-./CWE-707/XXX-000/noncompliant01.py
-./CWE-707/XXX-000/compliant01.py
-
-./CWE-707/XXX-001/README.md
-./CWE-707/XXX-001/noncompliant01.py
-./CWE-707/XXX-001/compliant01.py
+# template folder:
+./templates/compliant01.py
+./templates/example01.py
+./templates/noncompliant01.py
+./templates/README_TEMPLATE.md
+
+# section with its own readme.md, example01.py code and rule pyscg-0040 and pyscg-0041 below that:
+./01_introduction/readme.md
+./01_introduction/example01.py
+./01_introduction/pyscg-0040/README.md
+./01_introduction/pyscg-0040/example01.py
+./01_introduction/pyscg-0040/noncompliant01.py
+./01_introduction/pyscg-0040/compliant01.py
+./01_introduction/pyscg-0041/README.md
+./01_introduction/pyscg-0041/example01.py
+./01_introduction/pyscg-0041/noncompliant01.py
+./01_introduction/pyscg-0041/compliant01.py
 
-# Rule matching multiple CWEs of type Base, Variant or Class:
-./CWE-707/CWE-117/README.md
-./CWE-707/CWE-117/compliant01.py
-./CWE-707/CWE-117/noncompliant01.py
 ```
 
-## Coding Examples
+### Coding Examples
 
 Idealistically we have a `noncompliantXX.py` code matching in number the `XX` number of a `compliantXX.py` example with minimal changes between the two. The noncompliant and compliant code example's are also expected to contain the defensive code at the top while having the attacker code after the "#attempting to exploit" comment. Any code examples that do not qualify as compliant or noncompliant are named `exampleXX.py`.
 
@@ -183,9 +174,9 @@ Keep code examples as short while using simple Python, it's not about showing of
 
 There is the option to add `# TODO:` instead of overloading compliant code examples with all aspects of an end to end secure solution.
 
-## Submitting Your Contribution
+### Submitting Your Contribution
 
-1. __Create a new branch:__ Use descriptive names for branches, e.g., `pySCG-issue-123` or  `pySCG-add-logging-feature` using `git checkout -b branch-name`
+1. __Create a new branch:__ Use descriptive names for branches, e.g., `pyscg-issue-123` or  `pyscg-add-logging-feature` using `git checkout -b branch-name`
 
 2. __Make your changes:__ Commit your changes with clear and concise commit messages.
 
@@ -194,7 +185,7 @@ There is the option to add `# TODO:` instead of overloading compliant code examp
 
 4. __Submit a pull request:__ Go to the original repository and click on "New Pull Request". Fill out the template provided, detailing your changes and their purpose.
 
-## Review Process
+### Review Process
 
 A Pull Request is expected to have approval of at least 2 reviewers. One reviewer must be part of the core team for this Python project. The second can be anyone feeling brave enough who has a GitHub account.
 
diff --git a/docs/Secure-Coding-Guide-for-Python/readme.md b/docs/Secure-Coding-Guide-for-Python/readme.md
index 3b18f4c6..6c838e3c 100644
--- a/docs/Secure-Coding-Guide-for-Python/readme.md
+++ b/docs/Secure-Coding-Guide-for-Python/readme.md
@@ -9,7 +9,6 @@ An initiative by the OpenSSF to provide new Python programmers a resource to stu
 Documentation is written in academic style to support security researchers while using plain English to cater for an international audience.
 
 Python modules outside of the _Python Module Index_ [[Python 2023](https://docs.python.org/3.9/py-modindex.html)] are specifically not covered by this document.
-The structure is based on Common Weakness Enumeration (CWE) _Pillar Weakness_ [[MITRE Pillar 2024](https://cwe.mitre.org/documents/glossary/#Pillar%20Weakness)].
 
 Please join us, see [contributing](CONTRIBUTING.md)
 
@@ -24,7 +23,7 @@ Code examples are NOT to be used to cause harm of any kind to anyone or anything
 Every person writing code shall study the following:
 
 * _OWASP Developer Guide_ [[OWASP dev 2024](https://owasp.org/www-project-developer-guide/release/)]
-* _OWASP Top 10 Report_ [[OWASP 2021](https://owasp.org/www-project-top-ten/)]
+* _OWASP Top 10 Report_ [[OWASP 2021](https://owasp.org/Top10/A00_2021_Introduction/)]
 * _CWE Top 25_ [[MITRE 2024](https://cwe.mitre.org/top25/index.html)]
 
 ## Secure Coding Standard for Python
@@ -46,81 +45,167 @@ It is __not production code__ and requires code-style or python best practices t
 * Proper logging instead of printing to `stdout`
 * Secure coding compliance outside of described issue
 
-|[CWE-664: Improper Control of a Resource Through its Lifetime](https://cwe.mitre.org/data/definitions/664.html)|Prominent CVE|
-|:-----------------------------------------------------------------------------------------------------------------------------------------------|:----|
-|[CWE-134: Use of Externally-Controlled Format String](CWE-664/CWE-134/README.md)|[CVE-2022-27177](https://www.cvedetails.com/cve/CVE-2022-27177/),<br/>CVSSv3.1: __9.8__,<br/>EPSS: __00.37__ (01.12.2023)|
-|[CWE-197: Numeric Truncation Error](CWE-664/CWE-197/README.md)||
-|[CWE-197: Control rounding when converting to less precise numbers](CWE-664/CWE-197/01/README.md)||
-|[CWE-209: Generation of Error Message Containing Sensitive Information](CWE-664/CWE-209/README.md)|[CVE-2013-0773](https://www.cvedetails.com/cve/CVE-2013-0773/),<br/>CVSSv3.1:__3.3__,<br/>EPSS: __00.95__ (23.11.2023)|
-|[CWE-400: Uncontrolled Resource Consumption](CWE-664/CWE-400/README.md)||
-|[CWE-404: Improper Resource Shutdown or Release](CWE-664/CWE-404/README.md)||
-|[CWE-409: Improper Handling of Highly Compressed Data (Data Amplification)](CWE-664/CWE-409/README.md)||
-|[CWE-410: Insufficient Resource Pool](CWE-664/CWE-410/README.md)||
-|[CWE-426: Untrusted Search Path](CWE-664/CWE-426/README.md)|[CVE-2015-1326](https://www.cvedetails.com/cve/CVE-2015-1326),<br/>CVSSv3.0: __8.8__,<br/>EPSS: __00.20__ (23.11.2023)|
-|[CWE-459: Incomplete Cleanup](CWE-664/CWE-459/README.md)||
-|[CWE-460: Improper Cleanup on Thrown Exception](CWE-664/CWE-460/README.md)|[CVE-2008-0002](https://www.cvedetails.com/cve/CVE-2008-0002),<br/>CVSSv3.1: __5.8__,<br/>EPSS: __04.10__ (04.09.2025)|
-|[CWE-501: Trust Boundary Violation)](CWE-664/CWE-501/README.md)|[CVE-2023-28597](https://www.cvedetails.com/cve/CVE-2023-28597),<br/>CVSSv3.0: __7.5__,<br/>EPSS: __00.11__ (05.11.2024)|
-|[CWE-502: Deserialization of Untrusted Data)](CWE-664/CWE-502/.)|[CVE-2018-8021](https://www.cvedetails.com/cve/CVE-2018-8021),<br/>CVSSv3.0: __9.8__,<br/>EPSS: __93.54__ (05.11.2024)|
-|[CWE-532: Insertion of Sensitive Information into Log File](CWE-664/CWE-532/README.md)|[CVE-2023-45585](https://www.cvedetails.com/cve/CVE-2023-45585),<br/>CVSSv3.1: __9.8__,<br/>EPSS: __0.04__ (01.11.2024)|
-|[CWE-584: Return Inside Finally Block](CWE-664/CWE-584/README.md)||
-|[CWE-665: Improper Initialization](CWE-664/CWE-665/README.md)||
-|[CWE-681: Incorrect Conversion between Numeric Types](CWE-664/CWE-681/README.md)||
-|[CWE-681: Avoid an uncontrolled loss of precision when passing floating-point literals to a Decimal constructor.](CWE-664/CWE-681/01/README.md)||
-|[CWE-833: Deadlock](CWE-664/CWE-833/README.md)||
-|[CWE-843: Access of Resource Using Incompatible Type ('Type Confusion')](CWE-664/CWE-843/README.md)|[CVE-2021-29513](https://www.cvedetails.com/cve/CVE-2021-29513),<br/>CVSSv3.1: __7.8__,<br/>EPSS: __00.02__ (13.05.2025)|
-
-|[CWE-682: Incorrect Calculation](https://cwe.mitre.org/data/definitions/682.html)|Prominent CVE|
-|:---------------------------------------------------------------------------------------------------------------|:----|
-|[CWE-191: Integer Underflow (Wrap or Wraparound)](CWE-682/CWE-191/README.md)||
-|[CWE-1335: Incorrect Bitwise Shift of Integer](CWE-682/CWE-1335/README.md)||
-|[CWE-1335: Promote readability and compatibility by using mathematical written code with arithmetic operations instead of bit-wise operations](CWE-682/CWE-1335/01/README.md)||
-|[CWE-1339: Insufficient Precision or Accuracy of a Real Number](CWE-682/CWE-1339/.)                            ||
-
-|[CWE-691: Insufficient Control Flow Management](https://cwe.mitre.org/data/definitions/691.html)|Prominent CVE|
-|:---------------------------------------------------------------------------------------------------------------|:----|
-|[CWE-366: Race Condition within a Thread](CWE-691/CWE-366/README.md)||
-|[CWE-362: Concurrent Execution Using Shared Resource with Improper Synchronization ("Race Condition")](CWE-691/CWE-362/README.md)||
-|[CWE-617: Reachable Assertion](CWE-691/CWE-617/README.md)||
-|[CWE-783: Operator Precedence Logic Error](CWE-691/CWE-783/README.md)||
-
-|[CWE-693: Protection Mechanism Failure](https://cwe.mitre.org/data/definitions/693.html)|Prominent CVE|
-|:---------------------------------------------------------------------------------------------------------------|:----|
-|[CWE-182: Collapse of Data into Unsafe Value](CWE-693/CWE-182/README.md)||
-|[CWE-184: Incomplete List of Disallowed Input](CWE-693/CWE-184/README.md)||
-|[CWE-330: Use of Insufficiently Random Values](CWE-693/CWE-330/README.md)|[CVE-2020-7548](https://www.cvedetails.com/cve/CVE-2020-7548),<br/>CVSSv3.1: __9.8__,<br/>EPSS: __0.22__ (12.12.2024)|
-|[CWE-472: External Control of Assumed-Immutable Web Parameter](CWE-693/CWE-472/README.md)||
-|[CWE-778: Insufficient Logging](CWE-693/CWE-778/README.md)||
-|[CWE-798: Use of hardcoded credentials](CWE-693/CWE-798/README.md)||
-
-|[CWE-697: Incorrect Comparison](https://cwe.mitre.org/data/definitions/697.html)|Prominent CVE|
-|:----------------------------------------------------------------|:----|
-|[CWE-595: Comparison of Object References Instead of Object Contents](CWE-697/CWE-595/README.md)||
-
-|[CWE-703: Improper Check or Handling of Exceptional Conditions](https://cwe.mitre.org/data/definitions/703.html)|Prominent CVE|
-|:----------------------------------------------------------------|:----|
-|[CWE-230: Improper Handling of Missing Values](CWE-703/CWE-230/.)||
-|[CWE-252: Unchecked Return Value](CWE-703/CWE-252/README.md)||
-|[CWE-390: Detection of Error Condition without Action](CWE-703/CWE-390/README.md)||
-|[CWE-392: Missing Report of Error Condition](CWE-703/CWE-392/README.md)||
-|[CWE-397: Declaration of Throws for Generic Exception](CWE-703/CWE-397/README.md)||
-|[CWE-476: NULL Pointer Dereference](CWE-703/CWE-476/README.md)||
-|[CWE-754: Improper Check for Unusual or Exceptional Conditions - float](CWE-703/CWE-754/README.md)||
-|[CWE-755: Improper Handling of Exceptional Conditions](CWE-703/CWE-755/README.md)|[CVE-2024-39560](https://www.cvedetails.com/cve/CVE-2024-39560),<br/>CVSSv3.1: __6.5__,<br/>EPSS: __0.04__ (01.11.2024)|
-
-|[CWE-707: Improper Neutralization](https://cwe.mitre.org/data/definitions/707.html)|Prominent CVE|
-|:----------------------------------------------------------------|:----|
-|[CWE-78: Improper Neutralization of Special Elements Used in an OS Command ("OS Command Injection")](CWE-707/CWE-78/README.md)|[CVE-2024-43804](https://www.cvedetails.com/cve/CVE-2024-43804/),<br/>CVSSv3.1: __8.8__,<br/>EPSS: __00.06__ (08.11.2024)|
-|[CWE-89: Improper Neutralization of Special Elements used in an SQL Command ('SQL Injection')](CWE-707/CWE-89/README.md)|[CVE-2019-8600](https://www.cvedetails.com/cve/CVE-2019-8600/),<br/>CVSSv3.1: __9.8__,<br/>EPSS: __01.43__ (18.02.2024)|
-|[CWE-117: Improper Output Neutralization for Logs](CWE-707/CWE-117/README.md)||
-|[CWE-175: Improper Handling of Mixed Encoding](CWE-707/CWE-175/README.md)||
-|[CWE-180: Incorrect behavior order: Validate before Canonicalize](CWE-707/CWE-180/README.md)|[CVE-2022-26136](https://www.cvedetails.com/cve/CVE-2022-26136/),<br/>CVSSv3.1: __9.8__,<br/>EPSS: __00.18__ (24.04.2025)|
-|[CWE-838: Inappropriate Encoding for Output Context](CWE-707/CWE-838/README.md)||
-
-|[CWE-710: Improper Adherence to Coding Standards](https://cwe.mitre.org/data/definitions/710.html)|Prominent CVE|
-|:----------------------------------------------------------------|:----|
-|[CWE-1095: Loop Condition Value Update within the Loop](CWE-710/CWE-1095/README.md)||
-|[CWE-1109: Use of Same Variable for Multiple Purposes](CWE-710/CWE-1109/README.md)||
-|[CWE-489: Active Debug Code](CWE-710/CWE-489/README.md)|[CVE-2018-14649](https://www.cvedetails.com/cve/CVE-2018-14649),<br/>CVSSv3.1: __9.8__,<br/>EPSS: __69.64__ (12.12.2023)|
+<table border=1>
+<tr>
+<th>MITRE</th>
+<th>01 Introduction</th>
+<th>Prominent CVEs</th>
+</tr>
+
+<tr>
+<td>CWE-501</td>
+<td><a href=01_introduction/pyscg-0040/README.md>pyscg-0040: Respect Trust Boundaries</a></td>
+<td><a href="https://www.cvedetails.com/cve/CVE-2023-28597">CVE-2023-28597</a>,<br>CVSSv3.0: <strong style='color:orange'>7.5</strong>,<br>EPSS: <strong>00.11</strong> (05.11.2024)</td>
+</tr>
+
+<tr><td>CWE-798</td><td><a href=01_introduction/pyscg-0041/README.md>pyscg-0041: Avoid Hardcoded Credentials</a></td><td></td></tr>
+<tr><td>CWE-783</td><td><a href=01_introduction/pyscg-0042/README.md>pyscg-0042: Mind Operator Precedence</a></td><td></td></tr>
+<tr><td>CWE-472</td><td><a href=01_introduction/pyscg-0055/README.md>pyscg-0055: Validate Web Parameters</a></td><td></td></tr>
+
+<tr>
+<th>MITRE</th>
+<th>02 Encoding and Strings</th>
+<th>Prominent CVEs</th>
+</tr>
+<tr><td>CWE-175</td><td><a href=02_encoding_and_strings/pyscg-0043/README.md>pyscg-0043: Handle Mixed Character Encoding</a></td><td></td></tr>
+
+<tr>
+<td>CWE-180</td>
+<td><a href=02_encoding_and_strings/pyscg-0044/README.md>pyscg-0044: Validate Before Canonicalize</a></td>
+<td><a href="https://www.cvedetails.com/cve/CVE-2022-26136/">CVE-2022-26136</a>,<br>CVSSv3.1: <strong style='color:red'>9.8</strong>,<br>EPSS: <strong>00.28</strong> (31.12.2025)</td>
+</tr>
+
+<tr><td>CWE-182</td><td><a href=02_encoding_and_strings/pyscg-0045/README.md>pyscg-0045: Enforce Consistent Encoding</a></td></tr>
+
+<tr><td>CWE-838</td><td><a href=02_encoding_and_strings/pyscg-0046/README.md>pyscg-0046: Context-Appropriate Output Encoding</a></td><td></td></tr>
+
+<tr>
+<th>MITRE</th>
+<th>03 Numbers</th>
+<th>Prominent CVEs</th>
+</tr>
+
+<tr><td>CWE-1339</td><td><a href=03_numbers/pyscg-0001/README.md>pyscg-0001: Control Numeric Precision</a></td><td></td></tr>
+<tr><td>CWE-191</td><td><a href=03_numbers/pyscg-0002/README.md>pyscg-0002: Handle Integer Overflow</a></td><td></td></tr>
+<tr><td>CWE-1335</td><td><a href=03_numbers/pyscg-0053/README.md>pyscg-0053: Handle Bitwise Shifts Safely</a></td><td></td></tr>
+<tr><td>CWE-1335</td><td><a href=03_numbers/pyscg-0003/README.md>pyscg-0003: Use Arithmetic Over Bitwise Operations</a></td><td></td></tr>
+<tr><td>CWE-197</td><td><a href=03_numbers/pyscg-0004/README.md>pyscg-0004: Use Integer Loop Counters</a></td><td></td></tr>
+<tr><td>CWE-197</td><td><a href=03_numbers/pyscg-0005/README.md>pyscg-0005: Control Rounding Behavior</a></td><td></td></tr>
+<tr><td>CWE-681</td><td><a href=03_numbers/pyscg-0006/README.md>pyscg-0006: Avoid Float String Comparisons</a></td><td></td></tr>
+<tr><td>CWE-681</td><td><a href=03_numbers/pyscg-0007/README.md>pyscg-0007: Avoid Float Literals</a></td><td></td></tr>
+
+<tr>
+<th>MITRE</th>
+<th>04 Neutralization</th>
+<th>Prominent CVEs</th>
+</tr>
+
+<tr><td>CWE-184</td><td><a href=04_neutralization/pyscg-0047/README.md>pyscg-0047: Use Allow Lists Over Deny Lists</a></td><td></td></tr>
+
+<tr>
+  <td>CWE-134</td>
+  <td><a href=04_neutralization/pyscg-0008/README.md>pyscg-0008: Prevent Format String Injection</a></td>
+  <td><a href="https://www.cvedetails.com/cve/CVE-2022-27177/">CVE-2022-27177</a>,<br>CVSSv3.1: <strong style='color:darkred'>9.8</strong>,<br>EPSS: <strong>00.37</strong> (01.12.2023)</td>
+</tr>
+
+<tr>
+  <td>CWE-78</td>
+  <td><a href=04_neutralization/pyscg-0009/README.md>pyscg-0009: Prevent OS Command Injection</a></td>
+  <td><a href="https://www.cvedetails.com/cve/CVE-2024-43804/">CVE-2024-43804</a>,<br>CVSSv3.1: <strong>8.8</strong>,<br>EPSS: <strong>00.06</strong> (08.11.2024)</td>
+</tr>
+
+<tr>
+ <td>CWE-89</td>
+ <td><a href=04_neutralization/pyscg-0010/README.md>pyscg-0010: Prevent SQL Injection</a></td>
+ <td><a href="https://www.cvedetails.com/cve/CVE-2019-8600">CVE-2019-8600</a>,<br>CVSSv3.1: <strong style='color:red'>9.8</strong>,<br>EPSS: <strong>01.43</strong> (18.02.2024)</td>
+</tr>
+
+<tr>
+<td>CWE-843</td>
+<td><a href=04_neutralization/pyscg-0011/README.md>pyscg-0011: Prevent Type Confusion</a></td>
+<td><a href="https://www.cvedetails.com/cve/CVE-2021-29513">CVE-2021-29513</a>,<br>CVSSv3.1: <strong style='color:orange'>7.8</strong>,<br>EPSS: <strong>00.02</strong> (13.05.2025)</td>
+</tr>
+
+<tr>
+  <td>CWE-409</td>
+  <td><a href=04_neutralization/pyscg-0012/README.md>pyscg-0012: Handle Data Amplification</a></td>
+  <td><a href="https://www.cvedetails.com/cve/CVE-2019-9674/">CVE-2019-9674</a>,<br>CVSSv3.1: <strong style='color:orange'>7.5</strong>,<br>EPSS: <strong>1.2%</strong> (10.09.2025)</td>
+</tr>
+
+<tr>
+  <td>CWE-426</td>
+  <td><a href=04_neutralization/pyscg-0013/README.md>pyscg-0013: Secure Search Paths</a></td>
+  <td><a href="https://www.cvedetails.com/cve/CVE-2015-1326">CVE-2015-1326</a>,<br>CVSSv3.0: <strong style='color:red'>8.8</strong>,<br>EPSS: <strong>00.20</strong> (23.11.2023)</td>
+</tr>
+
+<tr><td>CWE-502</td><td><a href=04_neutralization/pyscg-0023/README.md>pyscg-0023: Secure Deserialization</a></td><td><a href=https://www.cvedetails.com/cve/CVE-2018-8021>CVE-2018-8021</a>,<br>CVSSv3.0: <strong style='color:red'>9.8</strong>,<br>EPSS: <strong>93.54</strong> (05.11.2024)</td></tr>
+
+<tr>
+<th>MITRE</th>
+<th>05 Exception handling</th>
+<th>Prominent CVEs</th>
+</tr>
+
+<tr><td>CWE-397</td><td><a href=05_exception_handling/pyscg-0014/README.md>pyscg-0014: Avoid Generic Exception Declarations</a></td><td></td></tr>
+<tr><td>CWE-755</td><td><a href=05_exception_handling/pyscg-0015/README.md>pyscg-0015: Handle Exceptional Conditions</a></td><td><a href=https://www.cvedetails.com/cve/CVE-2024-39560>CVE-2024-39560</a>,<br>CVSSv3.1: <strong style='color:yellow'>6.5</strong>,<br>EPSS: <strong>0.04</strong> (01.11.2024)</td></tr>
+<tr><td>CWE-390</td><td><a href=05_exception_handling/pyscg-0016/README.md>pyscg-0016: Act on Error Conditions</a></td><td></td></tr>
+<tr><td>CWE-230</td><td><a href=05_exception_handling/pyscg-0017/README.md>pyscg-0017: Handle Missing Values</a></td><td></td></tr>
+<tr><td>CWE-754</td><td><a href=05_exception_handling/pyscg-0018/README.md>pyscg-0018: Check Float Exceptional Conditions</a></td><td></td></tr>
+<tr><td>CWE-460</td><td><a href=05_exception_handling/pyscg-0052/README.md>pyscg-0052: Clean Up on Exceptions</a></td><td></td></tr>
+
+<tr>
+<th>MITRE</th>
+<th>06 Logging</th>
+<th>Prominent CVEs</th>
+</tr>
+
+<tr>
+<td>CWE-532</td>
+  <td><a href=06_logging/pyscg-0019/README.md>pyscg-0019: Avoid Sensitive Data in Logs</a></td>
+  <td><a href="https://www.cvedetails.com/cve/CVE-2023-45585">CVE-2023-45585</a>,<br>CVSSv3.1: <strong>9.8</strong>,<br>EPSS: <strong>0.04</strong> (01.11.2024)</td>
+</tr>
+<tr><td>CWE-778</td><td><a href=06_logging/pyscg-0020/README.md>pyscg-0020: Ensure Sufficient Logging</a></td><td></td></tr>
+<tr><td>CWE-489</td><td><a href=06_logging/pyscg-0021/README.md>pyscg-0021: Remove Debug Code</a></td><td><a href=https://www.cvedetails.com/cve/CVE-2018-14649>CVE-2018-14649</a>,<br>CVSSv3.1: <strong style='color:red'>9.8</strong>,<br>EPSS: <strong>69.64</strong> (12.12.2023)</td></tr>
+<tr><td>CWE-117</td><td><a href=06_logging/pyscg-0022/README.md>pyscg-0022: Neutralize Log Output</a></td><td></td></tr>
+<tr><td>CWE-209</td><td><a href=06_logging/pyscg-0050/README.md>pyscg-0050: Avoid Sensitive Error Messages</a></td><td></td></tr>
+
+<tr>
+<th>MITRE</th>
+<th><a href="07_concurrency/readme.md">07 Concurrency</a></th>
+<th>Prominent CVE</th>
+</tr>
+<tr><td>CWE-400</td><td><a href=07_concurrency/pyscg-0024/README.md>pyscg-0024: Control Resource Consumption</a></td><td></td></tr>
+<tr><td>CWE-410</td><td><a href=07_concurrency/pyscg-0025/README.md>pyscg-0025: Size Resource Pools</a></td><td></td></tr>
+<tr><td>CWE-833</td><td><a href=07_concurrency/pyscg-0026/README.md>pyscg-0026: Prevent Deadlock</a></td><td></td></tr>
+<tr><td>CWE-362</td><td><a href=07_concurrency/pyscg-0027/README.md>pyscg-0027: Synchronize Shared Resources</a></td><td></td></tr>
+<tr><td>CWE-584</td><td><a href=07_concurrency/pyscg-0028/README.md>pyscg-0028: Avoid Returns in Finally</a></td><td></td></tr>
+<tr><td>CWE-665</td><td><a href=07_concurrency/pyscg-0029/README.md>pyscg-0029: Initialize Properly</a></td><td></td></tr>
+<tr><td>CWE-392</td><td><a href=07_concurrency/pyscg-0030/README.md>pyscg-0030: Report Thread Pool Errors</a></td><td></td></tr>
+<tr><td>CWE-404</td><td><a href=07_concurrency/pyscg-0051/README.md>pyscg-0051: Release Resources Properly</a></td><td></td></tr>
+<tr><td>CWE-366</td><td><a href=07_concurrency/pyscg-0054/README.md>pyscg-0054: Prevent Thread Race Conditions</a></td><td></td></tr>
+
+<tr>
+<th>MITRE</th>
+<th>08 Coding Standards</th>
+<th>Prominent CVE</th>
+</tr>
+
+<tr><td>CWE-1095</td><td><a href=08_coding_standards/pyscg-0031/README.md>pyscg-0031: Avoid Loop Condition Updates</a></td><td></td></tr>
+<tr><td>CWE-1109</td><td><a href=08_coding_standards/pyscg-0032/README.md>pyscg-0032: Use Variables for Single Purpose</a></td><td></td></tr>
+<tr><td>CWE-595</td><td><a href=08_coding_standards/pyscg-0033/README.md>pyscg-0033: Compare Object Contents</a></td><td></td></tr>
+<tr><td>CWE-476</td><td><a href=08_coding_standards/pyscg-0034/README.md>pyscg-0034: Check for None Values</a></td><td></td></tr>
+<tr><td>CWE-459</td><td><a href=08_coding_standards/pyscg-0035/README.md>pyscg-0035: Complete Resource Cleanup</a></td><td></td></tr>
+<tr><td>CWE-252</td><td><a href=08_coding_standards/pyscg-0036/README.md>pyscg-0036: Check Return Values</a></td><td></td></tr>
+<tr><td>CWE-617</td><td><a href=08_coding_standards/pyscg-0037/README.md>pyscg-0037: Avoid Reachable Assertions</a></td><td></td></tr>
+
+<tr>
+<th>MITRE</th>
+<th>09 Cryptography</th>
+<th>Prominent CVE</th>
+</tr>
+
+<tr><td>CWE-330</td><td><a href=09_cryptography/pyscg-0038/README.md>pyscg-0038: Use Secure Random Values</a></td><td><a href=https://www.cvedetails.com/cve/CVE-2020-7548>CVE-2020-7548</a>,<br>CVSSv3.1: <strong style='color:red'>9.8</strong>,<br>EPSS: <strong>0.22</strong> (12.12.2024)</td></tr>
+</table>
 
 ## Biblography