diff --git a/Makefile b/Makefile
index e12cdc8..bd88ef6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 	$(tex) $(tflags) $^
 	$(tex) $(tflags) $^
 
-userguide/userguide.tex: rest-api.tex host-management.tex console.tex code-update/code-update.tex
+userguide/userguide.tex: rest-api.tex host-management.tex console.tex architecture/code-update/code-update.tex
 
 %.tex: %.md
 	pandoc -o $@ $^
diff --git a/README.md b/README.md
index e05be8f..d1d3d82 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@
 These documents describe how to use OpenBMC, including using the programmatic
 interfaces to an OpenBMC system.
 
- - [code-update](code-update): Updating OpenBMC and host platform firmware
+ - [code-update](architecture/code-update): Updating OpenBMC and host platform firmware
 
  - [console.md](console.md): Using the host console
 
diff --git a/code-update/code-update-deprecated.md b/architecture/code-update/code-update-deprecated.md
similarity index 100%
rename from code-update/code-update-deprecated.md
rename to architecture/code-update/code-update-deprecated.md
diff --git a/code-update/code-update-diagrams.md b/architecture/code-update/code-update-diagrams.md
similarity index 100%
rename from code-update/code-update-diagrams.md
rename to architecture/code-update/code-update-diagrams.md
diff --git a/code-update/code-update.md b/architecture/code-update/code-update.md
similarity index 100%
rename from code-update/code-update.md
rename to architecture/code-update/code-update.md
diff --git a/code-update/flash-layout.md b/architecture/code-update/flash-layout.md
similarity index 100%
rename from code-update/flash-layout.md
rename to architecture/code-update/flash-layout.md
diff --git a/code-update/host-code-update.md b/architecture/code-update/host-code-update.md
similarity index 100%
rename from code-update/host-code-update.md
rename to architecture/code-update/host-code-update.md
diff --git a/designs/firmware-update-over-redfish.md b/designs/firmware-update-over-redfish.md
index 074e454..70b16f5 100644
--- a/designs/firmware-update-over-redfish.md
+++ b/designs/firmware-update-over-redfish.md
@@ -229,7 +229,7 @@
 D-Bus API's mocked to ensure proper code coverage.
 
 [1]: https://redfish.dmtf.org/
-[2]: https://github.com/openbmc/docs/blob/master/code-update/ubi-code-update.md#steps-to-update
+[2]: https://github.com/openbmc/docs/blob/master/architecture/code-update/code-update.md#steps-to-update
 [3]: http://redfish.dmtf.org/schemas/v1/UpdateService.json
 [4]: http://redfish.dmtf.org/schemas/v1/UpdateService.v1_4_0.json#/definitions/UpdateService
 [5]: https://www.supermicro.com/manuals/other/RedfishRefGuide.pdf
diff --git a/features.md b/features.md
index 4241d18..7fbfc0e 100644
--- a/features.md
+++ b/features.md
@@ -45,7 +45,7 @@
 [D-Bus Object Mapper]: https://github.com/openbmc/docs/blob/master/architecture/object-mapper.md
 [Entity manager]: https://github.com/openbmc/entity-manager/blob/master/README.md
 [Factory reset]: https://github.com/openbmc/phosphor-dbus-interfaces/tree/master/xyz/openbmc_project/Common/FactoryReset/README.md
-[Firmware update support]: https://github.com/openbmc/docs/blob/master/code-update/code-update.md
+[Firmware update support]: https://github.com/openbmc/docs/blob/master/architecture/code-update/code-update.md
 [Hardware Diagnostics]: https://github.com/openbmc/openpower-hw-diags/blob/master/README.md
 [Host management]: https://github.com/openbmc/docs/blob/master/host-management.md
 [Host management REST APIs]: https://github.com/openbmc/docs/blob/master/host-management.md
diff --git a/rest-api.md b/rest-api.md
index 7c570dc..96bad92 100644
--- a/rest-api.md
+++ b/rest-api.md
@@ -296,7 +296,7 @@
 ```
 
 For more details on uploading and updating software, see:
-https://github.com/openbmc/docs/tree/master/code-update
+https://github.com/openbmc/docs/tree/master/architecture/code-update
 
 ## Event subscription protocol
 It is possible to subscribe to events, of interest, occurring on the BMC.
diff --git a/userguide/userguide.tex b/userguide/userguide.tex
index e242ef7..2f323c5 100644
--- a/userguide/userguide.tex
+++ b/userguide/userguide.tex
@@ -29,6 +29,6 @@
 \input{rest-api}
 \input{host-management}
 \input{console}
-\input{code-update/code-update}
+\input{architecture/code-update/code-update}
 
 \end{document}