diff --git a/README.md b/README.md
index c24eac206b..81bc07abf2 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Documents that help to understand and contribute to Kata Containers.
 
 ### Design and Implementations
 
-* [Kata Containers Architecture](architecture.md): Architectural overview of Kata Containers
+* [Kata Containers Architecture](design/architecture.md): Architectural overview of Kata Containers
 * [Kata Containers design](./design/README.md): More Kata Containers design documents
 
 ### How to Contribute
diff --git a/Upgrading.md b/Upgrading.md
index 7379ff9268..b62e1dc516 100644
--- a/Upgrading.md
+++ b/Upgrading.md
@@ -142,7 +142,7 @@ standard package management tools for your distribution.
 
 Kata Containers requires additional resources to create a virtual machine
 container. These resources are called
-[Kata Containers assets](https://github.com/kata-containers/documentation/blob/master/architecture.md#assets),
+[Kata Containers assets](https://github.com/kata-containers/documentation/blob/master/design/architecture.md#assets),
 which comprise a guest kernel and a root filesystem or initrd image. This
 section describes when these components are updated.
 
diff --git a/design/README.md b/design/README.md
index 6c4bb32897..fb0000c5f9 100644
--- a/design/README.md
+++ b/design/README.md
@@ -2,7 +2,7 @@
 
 Kata Containers design documentations, include the 
 
-- [Kata Containers architecture](../architecture.md)
+- [Kata Containers architecture](architecture.md)
 - Working scenarios of Kata Containers
 - [API Design of Kata Containers](kata-api-design.md)
 - Kata Containers lifecycle
diff --git a/arch-images/CNM_detailed_diagram.png b/design/arch-images/CNM_detailed_diagram.png
similarity index 100%
rename from arch-images/CNM_detailed_diagram.png
rename to design/arch-images/CNM_detailed_diagram.png
diff --git a/arch-images/CNM_overall_diagram.png b/design/arch-images/CNM_overall_diagram.png
similarity index 100%
rename from arch-images/CNM_overall_diagram.png
rename to design/arch-images/CNM_overall_diagram.png
diff --git a/arch-images/DAX.png b/design/arch-images/DAX.png
similarity index 100%
rename from arch-images/DAX.png
rename to design/arch-images/DAX.png
diff --git a/arch-images/docker-kata.png b/design/arch-images/docker-kata.png
similarity index 100%
rename from arch-images/docker-kata.png
rename to design/arch-images/docker-kata.png
diff --git a/arch-images/kata-containers-network-hotplug-uml.txt b/design/arch-images/kata-containers-network-hotplug-uml.txt
similarity index 100%
rename from arch-images/kata-containers-network-hotplug-uml.txt
rename to design/arch-images/kata-containers-network-hotplug-uml.txt
diff --git a/arch-images/kata-containers-network-hotplug.png b/design/arch-images/kata-containers-network-hotplug.png
similarity index 100%
rename from arch-images/kata-containers-network-hotplug.png
rename to design/arch-images/kata-containers-network-hotplug.png
diff --git a/arch-images/kata-crio-uml.png b/design/arch-images/kata-crio-uml.png
similarity index 100%
rename from arch-images/kata-crio-uml.png
rename to design/arch-images/kata-crio-uml.png
diff --git a/arch-images/kata-crio-uml.txt b/design/arch-images/kata-crio-uml.txt
similarity index 100%
rename from arch-images/kata-crio-uml.txt
rename to design/arch-images/kata-crio-uml.txt
diff --git a/arch-images/kata-oci-create.svg b/design/arch-images/kata-oci-create.svg
similarity index 100%
rename from arch-images/kata-oci-create.svg
rename to design/arch-images/kata-oci-create.svg
diff --git a/arch-images/kata-oci-create.txt b/design/arch-images/kata-oci-create.txt
similarity index 100%
rename from arch-images/kata-oci-create.txt
rename to design/arch-images/kata-oci-create.txt
diff --git a/arch-images/kata-oci-exec.svg b/design/arch-images/kata-oci-exec.svg
similarity index 100%
rename from arch-images/kata-oci-exec.svg
rename to design/arch-images/kata-oci-exec.svg
diff --git a/arch-images/kata-oci-exec.txt b/design/arch-images/kata-oci-exec.txt
similarity index 100%
rename from arch-images/kata-oci-exec.txt
rename to design/arch-images/kata-oci-exec.txt
diff --git a/arch-images/kata-oci-start.svg b/design/arch-images/kata-oci-start.svg
similarity index 100%
rename from arch-images/kata-oci-start.svg
rename to design/arch-images/kata-oci-start.svg
diff --git a/arch-images/kata-oci-start.txt b/design/arch-images/kata-oci-start.txt
similarity index 100%
rename from arch-images/kata-oci-start.txt
rename to design/arch-images/kata-oci-start.txt
diff --git a/arch-images/network.png b/design/arch-images/network.png
similarity index 100%
rename from arch-images/network.png
rename to design/arch-images/network.png
diff --git a/arch-images/qemu.png b/design/arch-images/qemu.png
similarity index 100%
rename from arch-images/qemu.png
rename to design/arch-images/qemu.png
diff --git a/arch-images/shimv2.svg b/design/arch-images/shimv2.svg
similarity index 100%
rename from arch-images/shimv2.svg
rename to design/arch-images/shimv2.svg
diff --git a/architecture.md b/design/architecture.md
similarity index 100%
rename from architecture.md
rename to design/architecture.md