diff --git a/doc/vortex_microarchitecture_v2.png b/doc/Images/vortex_microarchitecture_v2.png
similarity index 100%
rename from doc/vortex_microarchitecture_v2.png
rename to doc/Images/vortex_microarchitecture_v2.png
diff --git a/doc/Microarchitecture.md b/doc/Microarchitecture.md
index d8892e62..1b410066 100644
--- a/doc/Microarchitecture.md
+++ b/doc/Microarchitecture.md
@@ -32,7 +32,7 @@ Vortex uses the SIMT (Single Instruction, Multiple Threads) execution model with
 
 ### Vortex Pipeline/Datapath
 
-![Image of Vortex Microarchitecture](vortex_microarchitecture_v2.png)
+![Image of Vortex Microarchitecture](./Images/vortex_microarchitecture_v2.png)
 
 Vortex has a 5-stage pipeline: FI | ID | Issue | EX | WB.
 
diff --git a/doc/Vortex.md b/doc/Vortex.md
index 16dad807..f1d410a6 100644
--- a/doc/Vortex.md
+++ b/doc/Vortex.md
@@ -2,10 +2,11 @@
 
 ### Table of Contents
 
-- Vortex Microarchitecture
+- [Vortex Codebase Layout](https://github.com/vortexgpgpu/vortex-dev/blob/master/doc/Codebase.md)
+- [Vortex Microarchitecture and Extended RISC-V ISA](https://github.com/vortexgpgpu/vortex-dev/blob/master/doc/Microarchitecture.md)
 - Vortex Software
 - [Vortex Simulation](https://github.com/vortexgpgpu/vortex-dev/blob/master/doc/Simulation.md)
-- [FPGA](https://github.com/vortexgpgpu/vortex-dev/blob/master/doc/Flubber_FPGA_Startup_Guide.md)
+- [FPGA Configuration, Program and Test](https://github.com/vortexgpgpu/vortex-dev/blob/master/doc/Flubber_FPGA_Startup_Guide.md)
 - Debugging
 - Useful Links