diff --git a/_data/sidebars/tfs.yml b/_data/sidebars/tfs.yml
index 43f02863..aff36aac 100644
--- a/_data/sidebars/tfs.yml
+++ b/_data/sidebars/tfs.yml
@@ -80,6 +80,10 @@ entries:
       url: codedui
       output: web, pdf
 
+    - title: IntelliTrace
+      url: intellitrace
+      output: web, pdf
+
   - title: Build
     output: web, pdf
 
diff --git a/labs/Intellitrace/media/image1.png b/labs/tfs/intellitrace/media/image1.png
similarity index 100%
rename from labs/Intellitrace/media/image1.png
rename to labs/tfs/intellitrace/media/image1.png
diff --git a/labs/Intellitrace/media/image10.png b/labs/tfs/intellitrace/media/image10.png
similarity index 100%
rename from labs/Intellitrace/media/image10.png
rename to labs/tfs/intellitrace/media/image10.png
diff --git a/labs/Intellitrace/media/image11.png b/labs/tfs/intellitrace/media/image11.png
similarity index 100%
rename from labs/Intellitrace/media/image11.png
rename to labs/tfs/intellitrace/media/image11.png
diff --git a/labs/Intellitrace/media/image12.png b/labs/tfs/intellitrace/media/image12.png
similarity index 100%
rename from labs/Intellitrace/media/image12.png
rename to labs/tfs/intellitrace/media/image12.png
diff --git a/labs/Intellitrace/media/image13.png b/labs/tfs/intellitrace/media/image13.png
similarity index 100%
rename from labs/Intellitrace/media/image13.png
rename to labs/tfs/intellitrace/media/image13.png
diff --git a/labs/Intellitrace/media/image14.png b/labs/tfs/intellitrace/media/image14.png
similarity index 100%
rename from labs/Intellitrace/media/image14.png
rename to labs/tfs/intellitrace/media/image14.png
diff --git a/labs/Intellitrace/media/image15.png b/labs/tfs/intellitrace/media/image15.png
similarity index 100%
rename from labs/Intellitrace/media/image15.png
rename to labs/tfs/intellitrace/media/image15.png
diff --git a/labs/Intellitrace/media/image16.png b/labs/tfs/intellitrace/media/image16.png
similarity index 100%
rename from labs/Intellitrace/media/image16.png
rename to labs/tfs/intellitrace/media/image16.png
diff --git a/labs/Intellitrace/media/image17.png b/labs/tfs/intellitrace/media/image17.png
similarity index 100%
rename from labs/Intellitrace/media/image17.png
rename to labs/tfs/intellitrace/media/image17.png
diff --git a/labs/Intellitrace/media/image18.png b/labs/tfs/intellitrace/media/image18.png
similarity index 100%
rename from labs/Intellitrace/media/image18.png
rename to labs/tfs/intellitrace/media/image18.png
diff --git a/labs/Intellitrace/media/image19.png b/labs/tfs/intellitrace/media/image19.png
similarity index 100%
rename from labs/Intellitrace/media/image19.png
rename to labs/tfs/intellitrace/media/image19.png
diff --git a/labs/Intellitrace/media/image2.png b/labs/tfs/intellitrace/media/image2.png
similarity index 100%
rename from labs/Intellitrace/media/image2.png
rename to labs/tfs/intellitrace/media/image2.png
diff --git a/labs/Intellitrace/media/image20.png b/labs/tfs/intellitrace/media/image20.png
similarity index 100%
rename from labs/Intellitrace/media/image20.png
rename to labs/tfs/intellitrace/media/image20.png
diff --git a/labs/Intellitrace/media/image3.png b/labs/tfs/intellitrace/media/image3.png
similarity index 100%
rename from labs/Intellitrace/media/image3.png
rename to labs/tfs/intellitrace/media/image3.png
diff --git a/labs/Intellitrace/media/image4.png b/labs/tfs/intellitrace/media/image4.png
similarity index 100%
rename from labs/Intellitrace/media/image4.png
rename to labs/tfs/intellitrace/media/image4.png
diff --git a/labs/Intellitrace/media/image5.png b/labs/tfs/intellitrace/media/image5.png
similarity index 100%
rename from labs/Intellitrace/media/image5.png
rename to labs/tfs/intellitrace/media/image5.png
diff --git a/labs/Intellitrace/media/image6.png b/labs/tfs/intellitrace/media/image6.png
similarity index 100%
rename from labs/Intellitrace/media/image6.png
rename to labs/tfs/intellitrace/media/image6.png
diff --git a/labs/Intellitrace/media/image7.png b/labs/tfs/intellitrace/media/image7.png
similarity index 100%
rename from labs/Intellitrace/media/image7.png
rename to labs/tfs/intellitrace/media/image7.png
diff --git a/labs/Intellitrace/media/image8.png b/labs/tfs/intellitrace/media/image8.png
similarity index 100%
rename from labs/Intellitrace/media/image8.png
rename to labs/tfs/intellitrace/media/image8.png
diff --git a/labs/Intellitrace/media/image9.png b/labs/tfs/intellitrace/media/image9.png
similarity index 100%
rename from labs/Intellitrace/media/image9.png
rename to labs/tfs/intellitrace/media/image9.png
diff --git a/labs/Intellitrace/readme.md b/labs/tfs/intellitrace/readme.md
similarity index 98%
rename from labs/Intellitrace/readme.md
rename to labs/tfs/intellitrace/readme.md
index bf5a6d8d..46f5ffa0 100644
--- a/labs/Intellitrace/readme.md
+++ b/labs/tfs/intellitrace/readme.md
@@ -1,4 +1,10 @@
-# Diagnosing Issues in Production with IntelliTrace and Visual Studio 2017
+---
+title: Diagnosing Issues in Production with IntelliTrace and Visual Studio 2017
+layout: page
+sidebar: tfs
+permalink: /labs/tfs/intellitrace/
+folder: /labs/tfs/intellitrace/
+---
 
 <p align="center">
 <img src="./media/image1.png"/>
@@ -263,7 +269,7 @@ In this exercise, you will learn how to deploy and use IntelliTrace
     file would be sent to a developer or tester for a more
     detailed look.
 
-## Exercise 1: Debugging with IntelliTrace Files from Production
+## Exercise 2: Debugging with IntelliTrace Files from Production
 
 In this exercise, you will see how we can use the IntelliTrace file
     that was generated on a production server to aid in debugging the
diff --git a/labs/tfs/readme.md b/labs/tfs/readme.md
index be3625a5..d39ce9b6 100644
--- a/labs/tfs/readme.md
+++ b/labs/tfs/readme.md
@@ -67,7 +67,7 @@ Lab Name
 <tr><td>Code Discovery using the Architecture Tools in Visual Studio Enterprise 2017             </td></tr>
 <tr><td><a href="devteamcollaboration/">Collaboration Experiences for Development Teams using Team Foundation Server 2017   </a>     </td></tr>
 <tr><td>Debugging with IntelliTrace using Visual Studio Enterprise 2017                          </td></tr>
-<tr><td>Diagnosing Issues in Production with IntelliTrace and Visual Studio 2017                 </td></tr>
+<tr><td><a href="intellitrace/">Diagnosing Issues in Production with IntelliTrace and Visual Studio 2017  </a>               </td></tr>
 <tr><td><a href="releasemanagement/">Embracing Continuous Delivery with Release Management for Visual Studio 2017          </a>   </td></tr>
 <tr><td><a href="exploratorytesting/">Exploratory Testing and Feedback Management with Team Foundation Server 2017</a>                                    </td></tr>
 <tr><td><a href="git/">Getting Started with Git using Team Foundation Server 2017</a>                              </td></tr>