diff --git a/source/management_and_operations/references/creating_images.rst b/source/management_and_operations/guest_os/creating_images.rst
similarity index 100%
rename from source/management_and_operations/references/creating_images.rst
rename to source/management_and_operations/guest_os/creating_images.rst
diff --git a/source/management_and_operations/guest_os/index.rst b/source/management_and_operations/guest_os/index.rst
index 758a89339d..18b1c295dd 100644
--- a/source/management_and_operations/guest_os/index.rst
+++ b/source/management_and_operations/guest_os/index.rst
@@ -5,4 +5,6 @@ Guest Operating Systems
 .. toctree::
     :maxdepth: 2
 
-    Windows Best Practices <windows_best_practice>
\ No newline at end of file
+    Contextualization <kvm_contextualization>
+    Creating Disk Images <creating_images>
+    Windows Best Practices <windows_best_practice>
diff --git a/source/management_and_operations/references/kvm_contextualization.rst b/source/management_and_operations/guest_os/kvm_contextualization.rst
similarity index 100%
rename from source/management_and_operations/references/kvm_contextualization.rst
rename to source/management_and_operations/guest_os/kvm_contextualization.rst
diff --git a/source/management_and_operations/guest_os/windows_best_practice.rst b/source/management_and_operations/guest_os/windows_best_practice.rst
index c8f0989682..42ee7093cd 100644
--- a/source/management_and_operations/guest_os/windows_best_practice.rst
+++ b/source/management_and_operations/guest_os/windows_best_practice.rst
@@ -20,9 +20,11 @@ In order to begin installing Windows we will need to create a template which wil
 - Download the Windows ISO of your choice from Microsoft.  Add this as a CDROM type image in OpenNebula
 - :ref:`Create a persistent empty image <creating_images>` which will be the target disk for Windows to be installed on. Different versions of Windows require different minimum disk space.
   Under Advanced Options set BUS to Virtio, and setting the format to RAW will also increase disk performance but QCOW2 is sparse and saves disk space.
+
 .. image:: /images/windows_bp_create_image.png
   :width: 90%
   :align: center
+
 - Download the `VirtIO Drivers ISO from the virtio-win github page <https://github.com/virtio-win/virtio-win-pkg-scripts/blob/master/README.md>`_ and add it to OpenNebula as a CDROM type.
   If you require WHQL-signed VirtIO drivers, then you may need to obtain those through a paid RHEL License as noted in that README.
 - Download the latest `OpenNebula Contextualization ISO <https://github.com/OpenNebula/one-apps/releases>`__ and add it to OpenNebula as a CDROM type.
@@ -258,4 +260,4 @@ At this point you can make any internal changes to the operating system necessar
 Extra Suggestions
 =================
 
-Internally, the Windows OS can be a bit slower through this interface, partially due to the graphical effects. If you open Settings and navigate to System -> About -> Advanced system settings (on the right side), a window should pop up.  On this window inside the Performance section click the Settings... button.  Here, select the Adjust for best performance, or modify the check-boxes to your liking. The less effects, the more responsive the interface will be.
\ No newline at end of file
+Internally, the Windows OS can be a bit slower through this interface, partially due to the graphical effects. If you open Settings and navigate to System -> About -> Advanced system settings (on the right side), a window should pop up.  On this window inside the Performance section click the Settings... button.  Here, select the Adjust for best performance, or modify the check-boxes to your liking. The less effects, the more responsive the interface will be.
diff --git a/source/management_and_operations/references/index.rst b/source/management_and_operations/references/index.rst
index bccc6a22ff..a1211a8a1e 100644
--- a/source/management_and_operations/references/index.rst
+++ b/source/management_and_operations/references/index.rst
@@ -9,5 +9,3 @@ References
    Image Template <img_template>
    Virtual Network Template <vnet_template>
    Command Line Interface <cli>
-   Guest OS Installation <creating_images>
-   Contextualization <kvm_contextualization>