Major structure cleanup

docs/NAVIGATION.md

@@ -1,62 +1,67 @@
 - [Home](index.md)
-- Hardware
-  - [SKU List](retail-xone-skus.md)
-  - [Codenames](codenames.md)
-  - [Console revisions](console-revisions.md)
-  - [CPU](cpu.md)
-  - [Southbridge](southbridge.md)
-  - [eMMC / Flash](emmc-flash.md)
-  - [Wifi](wifi.md)
-  - [Ethernet](ethernet.md)
-  - [Optical Disc Drive](optical-disc-drive.md)
-    - [ODD Update Logs](optical-disc-drive/odd-firmware-update-log.md)
-  - [RF unit](rf-unit.md)
-  - [XDK Transfer device](xdk_transfer.md)
-- Software
-  - [Firmware](firmware.md)
-  - [Bootanimation](bootanimation.md)
-  - [Bootloaders](bootloaders.md)
-  - [Certificates](certificates.md)
-  - [Flash (XBFS)](xbox-boot-file-system.md)
-  - [Southbridge filesystem (SBFS)](southbridge-file-system.md)
-  - [Hard drive](harddrive.md)
-  - [Security Processor](security-processor.md)
-  - [USB NTFS Overrides](usb-ntfs-overrides.md)
-  - [Telemetry](telemetry.md)
-  - [Protocol URIs (Deep links)](protocol-URIs.md)
-  - [Xbox Game Disc](xbox-game-disc.md)
-  - [XEO3 Emulator](xeo3.md)
-    - xeo3/*.md
-  - [Xbox Operating System](xbox-operating-system.md)
-  - [Xbox UI](xbox-ui.md)
-  - [Xbox WinRT](winmd.md)
-  - [XCRDUtil](xcrdutil.md)
-  - [DefaultApp](default-app.md)
-  - [Kiosk](kiosk.md)
-  - [Exploits](exploits.md)
+- Security
+  - [General Security design](security/general-security-design.md)
+  - [Security Processor (AMD PSP)](security/security-processor.md)
+  - [Certificates](security/certificates.md)
+  - [Exploits](security/exploits.md)
     - exploits/*.md
-  - [Unauthorized Xbox Device Lockout](unauthorized-device-lockout.md)
+- Boot
+  - [Bootloaders / Bootchain](boot/bootloaders.md)
+  - [Soutbridge filesystem (SBFS)](boot/southbridge-file-system.md)
+  - [Boot filesystem (XBFS)](boot/xbox-boot-file-system.md)
+  - [VBI (Virtual boot image)](boot/vbi.md)
+  - [NTFS USB overrides](boot/usb-ntfs-overrides.md)
+  - [Bootanimation](boot/bootanimation.md)
+- Console models
+  - [Console revisions](console-models/console-revisions.md)
+  - [Retail SKUs](console-models/retail-xone-skus.md)
+  - [Devkit types](console-models/devkit-types.md)
+- Hardware
+  - [CPU](hardware/cpu.md)
+  - [Southbridge](hardware/southbridge.md)
+  - [eMMC / Flash](hardware/emmc-flash.md)
+  - [Wifi](hardware/wifi.md)
+  - [Ethernet](hardware/ethernet.md)
+  - [Optical Disc Drive](hardware/optical-disc-drive.md)
+    - [ODD Update Logs](hardware/odd-firmware-update-log.md)
+  - [RF unit](hardware/rf-unit.md)
+  - [XDK Transfer device](hardware/xdk_transfer.md)
+- Operating system
+  - [Firmware](operating-system/firmware.md)
+  - [Hard drive layout](operating-system/harddrive-partitioning.md)
+  - [Telemetry](operating-system/telemetry.md)
+  - [Protocol URIs (Deep links)](operating-system/protocol-URIs.md)
+  - [Xbox Operating System](operating-system/xbox-operating-system.md)
+  - [Xbox UI](operating-system/xbox-ui.md)
+  - [XCRDUtil](operating-system/xcrdutil.md)
+  - [DefaultApp](operating-system/default-app.md)
+  - [Kiosk](operating-system/kiosk.md)
+  - [Xbox Virtual Drives (XVD)](operating-system/xbox-virtual-drive.md)
+  - [Unauthorized Xbox Device Lockout](operating-system/unauthorized-device-lockout.md)
+- Games
+  - [Xbox Game Disc](games/xbox-game-disc.md)
+  - [XEO3 Emulator](games/xeo3-x360-classic-xbox-emulator.md)
+  - [Savegames](games/savegames.md)
 - Xbox Live
   - [Xbox Live Error Codes](xbox-live/hresult-error-codes.md)
   - [XSTS Token](xbox-live/xsts-token.md)
   - [Update Groups](xbox-live/update-group-ids.md)
   - [Update CDN APIs and Downloads](xbox-live/update-cdn.md)
 - File formats
-  - [Update.cfg](update-cfg.md)
-  - [Xbox Virtual Drives (XVD)](xbox-virtual-drive.md)
-  - [XVI](xvi.md)
-  - [XCT](xct.md)
-  - [VBI](vbi.md)
-  - [Savegames](savegames.md)
+  - [Update.cfg](file-formats/update-cfg.md)
+  - [XVI](file-formats/xvi.md)
+  - [XCT](file-formats/xct.md)
 - Development
-  - [PC tools](pc_tools.md)
-  - [Devkit types](devkit-types.md)
-  - [Setting up your console](setup-dev-mode.md)
-  - [Compiling for xbox](compiling-for-xbox.md)
-  - [Installing Compatible Software](installing-compatible-software.md)
-  - [Creating your own Windows User](creating-a-win-user.md)
-  - [Xbox Device Portal](device-portal.md)
-    - dev-portal-api/**
-  - [XTF APIs](xtf-apis.md)
-    - xtf-apis/*.md
+  - [PC tools](development/pc_tools.md)
+  - [Setting up your console](development/setup-dev-mode.md)
+  - [Compiling for xbox](development/compiling-for-xbox.md)
+  - [Installing Compatible Software](development/installing-compatible-software.md)
+  - [Creating your own Windows User](development/creating-a-win-user.md)
+  - [Xbox Device Portal](development/device-portal.md)
+  - [Xbox WinRT](development/winmd.md)
+    - development/dev-portal-api/**
+  - [XTF APIs](development/xtf-apis.md)
+    - development/xtf-apis/*.md
+- Misc
+  - [Codenames](misc/codenames.md)
 - [FAQ](faq.md)

docs/xbox-boot-file-system.md → docs/boot/xbox-boot-file-system.md

@@ -91,33 +91,33 @@ Size: 0x10
 
 ## File Entries
 
-| Index | Name         | Format | Plaintext | Information                                   | Per console |
-| ----- | ------------ | ------ | --------- | --------------------------------------------- | ----------- |
-| 01    | 1smcbl_a.bin | binary | no        | SMC bootloader, slot A                        | no          |
-| 02    | header.bin   | binary | yes       | XBFS header                                   | no          |
-| 03    | devkit.ini   | binary | no        | devkit ini                                    | unknown     |
-| 04    | mtedata.cfg  | binary | no        | MTE data                                      | unknown     |
-| 05    | certkeys.bin | binary | yes       | [SP/SMC Bootcap cert](certificates.md)        | yes         |
-| 06    | smcerr.log   | binary | no        | SMC error log                                 | no          |
-| 07    | system.xvd   | xvd    | yes       | SystemOS VM partition                         | no          |
-| 08    | $sosrst.xvd  | xvd    | yes       | SystemOS restore                              | no          |
-| 09    | download.xvd | xvd    | yes       | Download     ???                              | no          |
-| 10    | smc_s.cfg    | binary | no        | SMC config - static                           | unknown     |
-| 11    | sp_s.cfg     | binary | partially | [SP - static (console cert)](certificates.md) | yes         |
-| 12    | os_s.cfg     | binary | no        | OS config - static                            | unknown     |
-| 13    | smc_d.cfg    | binary | no        | SMC config - dynamic                          | unknown     |
-| 14    | sp_d.cfg     | binary | no        | SP config - dynamic                           | unknown     |
-| 15    | os_d.cfg     | binary | no        | OS config - dynamic                           | unknown     |
-| 16    | smcfw.bin    | binary | no        | SMC firmware                                  | unknown     |
-| 17    | boot.bin     | binary | no        | [Bootloaders](bootloaders.md)                 | unknown     |
-| 18    | host.xvd     | xvd    | yes       | HostOS partition                              | no          |
-| 19    | settings.xvd | xvd    | yes       | Settings                                      | no          |
-| 20    | 1smcbl_b.bin | binary | no        | SMC bootloader, slot B                        | no          |
-| 21    | bootanim.dat | binary | yes       | [Bootanimation](bootanimation.md)             | no          |
-| 22    | sostmpl.xvd  | xvd    | yes       | SystemOS template                             | no          |
-| 23    | update.cfg   | binary | yes       | Update config / log?                          | unknown     |
-| 24    | sosinit.xvd  | xvd    | yes       | SystemOS init                                 | no          |
-| 25    | hwinit.cfg   | binary | no        | Hardware init config                          | unknown     |
+| Index | Name         | Format | Plaintext | Information                                               | Per console |
+| ----- | ------------ | ------ | --------- | --------------------------------------------------------- | ----------- |
+| 01    | 1smcbl_a.bin | binary | no        | SMC bootloader, slot A                                    | no          |
+| 02    | header.bin   | binary | yes       | XBFS header                                               | no          |
+| 03    | devkit.ini   | binary | no        | devkit ini                                                | unknown     |
+| 04    | mtedata.cfg  | binary | no        | MTE data                                                  | unknown     |
+| 05    | certkeys.bin | binary | yes       | [SP/SMC Bootcap cert](../security/certificates.md)        | yes         |
+| 06    | smcerr.log   | binary | no        | SMC error log                                             | no          |
+| 07    | system.xvd   | xvd    | yes       | SystemOS VM partition                                     | no          |
+| 08    | $sosrst.xvd  | xvd    | yes       | SystemOS restore                                          | no          |
+| 09    | download.xvd | xvd    | yes       | Download     ???                                          | no          |
+| 10    | smc_s.cfg    | binary | no        | SMC config - static                                       | unknown     |
+| 11    | sp_s.cfg     | binary | partially | [SP - static (console cert)](../security/certificates.md) | yes         |
+| 12    | os_s.cfg     | binary | no        | OS config - static                                        | unknown     |
+| 13    | smc_d.cfg    | binary | no        | SMC config - dynamic                                      | unknown     |
+| 14    | sp_d.cfg     | binary | no        | SP config - dynamic                                       | unknown     |
+| 15    | os_d.cfg     | binary | no        | OS config - dynamic                                       | unknown     |
+| 16    | smcfw.bin    | binary | no        | SMC firmware                                              | unknown     |
+| 17    | boot.bin     | binary | no        | [Bootloaders](../boot/bootloaders.md)                     | unknown     |
+| 18    | host.xvd     | xvd    | yes       | HostOS partition                                          | no          |
+| 19    | settings.xvd | xvd    | yes       | Settings                                                  | no          |
+| 20    | 1smcbl_b.bin | binary | no        | SMC bootloader, slot B                                    | no          |
+| 21    | bootanim.dat | binary | yes       | [Bootanimation](../boot/bootanimation.md)                 | no          |
+| 22    | sostmpl.xvd  | xvd    | yes       | SystemOS template                                         | no          |
+| 23    | update.cfg   | binary | yes       | Update config / log?                                      | unknown     |
+| 24    | sosinit.xvd  | xvd    | yes       | SystemOS init                                             | no          |
+| 25    | hwinit.cfg   | binary | no        | Hardware init config                                      | unknown     |
 
 Note: Only XVD header is plaintext, data portion is encrypted as usual.
 Per Console: Is file encrypted via console specific keys or locked to console by SocId.
@@ -132,7 +132,7 @@ Access to the Flash from SystemOS is possible via the provided pipes:
 
 ## Tools
 
-[QuantumTunnel](https://github.com/XboxOneResearch/QuantumTunnel) - (.NET Core) XBFS dumping tool that runs in [SystemOS](xbox-operating-system.md#system) to dump the XBFS from the console. It does require Administrator/NT System privileges.
+[QuantumTunnel](https://github.com/XboxOneResearch/QuantumTunnel) - (.NET Core) XBFS dumping tool that runs in [SystemOS](../operating-system/xbox-operating-system.md#system) to dump the XBFS from the console. It does require Administrator/NT System privileges.
 
 [xvdtool (XBFSTool)](https://github.com/emoose/xvdtool) - (.NET Core)Parsing / extraction of a raw XBFS image.
 

docs/devkit-types.md → docs/console-models/devkit-types.md

@@ -3,11 +3,11 @@
 
 # Devkits
 
-Most Xbox One devkits start out life as an off the shelf retail console (with the exception of special SP kits I will cover below). An Xbox One's devkit type and abilities or capabilities are defined by a file stored on the flash called "certkeys.bin." - certkeys.bin is referred to as the [Capability Certificate](certificates.md) by the Platform Security Processor ([PSP](security-processor.md)) and it will be referred to as such from here on out.
+Most Xbox One devkits start out life as an off the shelf retail console (with the exception of special SP kits I will cover below). An Xbox One's devkit type and abilities or capabilities are defined by a file stored on the flash called "certkeys.bin." - certkeys.bin is referred to as the [Capability Certificate](../security/certificates.md) by the Platform Security Processor ([PSP](../security/security-processor.md)) and it will be referred to as such from here on out.
 
 It should be noted that capability certificates are locked to a particular console via the SOCID (Reported as Console ID in settings). The entire certificate is then signed to prevent tampering.
 
-A capability certificate defines what capabilities an Xbox One console is allowed to enable (This is regulated via the [PSP](security-processor.md) and to a degree, HostOS.) The capabilities range from enabling Devmode and the respective developer services, ignoring requests to blowing e-fuses, HostOS telnet and Retail debugging, and much more.
+A capability certificate defines what capabilities an Xbox One console is allowed to enable (This is regulated via the [PSP](../security/security-processor.md) and to a degree, HostOS.) The capabilities range from enabling Devmode and the respective developer services, ignoring requests to blowing e-fuses, HostOS telnet and Retail debugging, and much more.
 
 ## Devkit types classified by software
 There are different types of devkits
@@ -24,34 +24,34 @@ There are different types of devkits
 
 ## Certificates
 
-See [Certificates](certificates.md)
+See [Certificates](../security/certificates.md)
 
 ## Godbox Certificate
 
-A magical capability certificate ([$Diagnosis/debug.bin on a NTFS USB](usb-ntfs-overrides.md)) that will temporaily activate a retail console as a limited Godbox for 24 hours. Kernel/User-Mode debugging is only possible on SystemOS and GameOS, not HostOS, and the temporary kit requires authentication against Live.
+A magical capability certificate ([$Diagnosis/debug.bin on a NTFS USB](../boot/usb-ntfs-overrides.md)) that will temporaily activate a retail console as a limited Godbox for 24 hours. Kernel/User-Mode debugging is only possible on SystemOS and GameOS, not HostOS, and the temporary kit requires authentication against Live.
 
 ## Devkit types classified by hardware
 Hardware wise, a bunch of different Xbox One and Xbox Series models exist. These are some of them, which mostly correspond to the ERA type mentioned in the previous section:
 
 **Xbox One PHAT game devkit:**
 
-![](./devkits/xbox_one_phat_xdk.webp)
+![](../_files/devkits/xbox_one_phat_xdk.webp)
 
 **Xbox One S game devkit:**
-![](./devkits/xbox_one_s_xdk.jpg)
+![](../_files/devkits/xbox_one_s_xdk.jpg)
 
 **Xbox One X testkit:**
-![inextestkit](./devkits/xbox_one_x_testkit.jpg)
+![inextestkit](../_files/devkits/xbox_one_x_testkit.jpg)
 
 **Xbox One X game devkit:**
-![Xb1X-ERA](./devkits/xbox_one_x_xdk.jpg)
+![Xb1X-ERA](../_files/devkits/xbox_one_x_xdk.jpg)
 
 **Xbox Series S/X game devkit (pre-release):**
-![Series X XDK](./devkits/series_x_xdk.jpg)
+![Series X XDK](../_files/devkits/series_x_xdk.jpg)
 
 **Xbox Series X game devkit (release version):**
 
 No pictures have surfaced yet, or no special game devkit with a retail Series X format exists.
 
 **Xbox Series S game devkit (release version):**
-![](./devkits/series_s_release_xdk.png)
+![](../_files/devkits/series_s_release_xdk.png)