diff --git a/windows/deployment/windows-autopilot/media/logo_excel-blk.svg b/windows/deployment/windows-autopilot/media/logo_excel-blk.svg
deleted file mode 100644
index fd9d407ae0..0000000000
--- a/windows/deployment/windows-autopilot/media/logo_excel-blk.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64">
-  <defs>
-    <style>
-      .cls-1 {
-        isolation: isolate;
-      }
-
-      .cls-2 {
-        fill: #fff;
-      }
-
-      .cls-3, .cls-5 {
-        fill-rule: evenodd;
-      }
-
-      .cls-4 {
-        opacity: 0.05;
-        mix-blend-mode: overlay;
-      }
-
-      .cls-5 {
-        fill: url(#linear-gradient);
-      }
-    </style>
-    <linearGradient id="linear-gradient" x1="4" y1="32" x2="37" y2="32" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#fff"/>
-      <stop offset="1"/>
-    </linearGradient>
-  </defs>
-  <title>logo_excel-blk</title>
-  <g class="cls-1">
-    <g id="Logos">
-      <g>
-        <rect class="cls-2" x="25" y="11" width="33" height="41" rx="1" ry="1"/>
-        <path d="M57,12V51H26V12H57m0-2H26a2,2,0,0,0-2,2V51a2,2,0,0,0,2,2H57a2,2,0,0,0,2-2V12a2,2,0,0,0-2-2Z"/>
-      </g>
-      <g>
-        <rect x="45" y="15" width="9" height="5"/>
-        <rect x="34" y="15" width="9" height="5"/>
-        <rect x="45" y="22" width="9" height="5"/>
-        <rect x="34" y="22" width="9" height="5"/>
-        <rect x="45" y="29" width="9" height="5"/>
-        <rect x="34" y="29" width="9" height="5"/>
-        <rect x="45" y="36" width="9" height="5"/>
-        <rect x="34" y="36" width="9" height="5"/>
-        <rect x="45" y="43" width="9" height="5"/>
-        <rect x="34" y="43" width="9" height="5"/>
-      </g>
-      <g>
-        <path class="cls-3" d="M37,4,4,9.84V54.18L37,60Z"/>
-        <g class="cls-4">
-          <path class="cls-5" d="M37,4,4,9.84V54.18L37,60Z"/>
-        </g>
-      </g>
-      <path class="cls-2" d="M27.11,21.85l-4.19.26-2.55,6-.17.53-.14.46-.11.39-.08.32h0c0-.16-.07-.31-.1-.45s-.07-.29-.11-.42l-.12-.39-.13-.36L17,22H13l4.44,10-4.7,9.3,3.94.24,2.65-6.11.12-.42.1-.37.08-.31c0-.09,0-.18.05-.25h0q0,.24.08.45t.08.37q0,.16.08.29a2,2,0,0,0,.07.21l2.75,6.52,4.46.27L22.13,31.94l5-10.1"/>
-    </g>
-  </g>
-</svg>
diff --git a/windows/deployment/windows-autopilot/media/logo_power-bi.svg b/windows/deployment/windows-autopilot/media/logo_power-bi.svg
deleted file mode 100644
index c29ce2bf1f..0000000000
--- a/windows/deployment/windows-autopilot/media/logo_power-bi.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #020202;
-      }
-    </style>
-  </defs>
-  <title>logo_power-bi</title>
-  <g id="Names">
-    <g id="Layer_2" data-name="Layer 2">
-      <g id="Layer_1-2" data-name="Layer 1-2">
-        <path class="cls-1" d="M55,48V45h1.45C59.2,45,61,42.75,61,40V13.64A4.35,4.35,0,0,0,56.45,9H7.55A4.35,4.35,0,0,0,3,13.64V40c0,2.75,1.8,5,4.55,5H9v3H7.55C3.38,48,0,44.18,0,40V13.64A7.64,7.64,0,0,1,7.55,6h48.9A7.64,7.64,0,0,1,64,13.64V40c0,4.17-3.38,8-7.55,8Z"/>
-        <path class="cls-1" d="M15.5,54.46A3.61,3.61,0,0,1,12,50.74V42.18a3.61,3.61,0,0,1,3.5-3.72h0A3.61,3.61,0,0,1,19,42.17v8.57a3.61,3.61,0,0,1-3.49,3.72Z"/>
-        <path class="cls-1" d="M26.5,54.13A3.52,3.52,0,0,1,23,50.6V29.67a3.5,3.5,0,1,1,7,0V50.6a3.51,3.51,0,0,1-3.49,3.54h0"/>
-        <path class="cls-1" d="M48.53,54.21A3.53,3.53,0,0,1,45,50.65V20.78a3.49,3.49,0,1,1,7,0V50.65a3.51,3.51,0,0,1-3.47,3.56h0"/>
-        <path class="cls-1" d="M37.51,54.3A3.55,3.55,0,0,1,34,50.7V34.89a3.5,3.5,0,1,1,7,0V50.7a3.54,3.54,0,0,1-3.49,3.59"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/windows/deployment/windows-autopilot/media/pbi-dax-intro.svg b/windows/deployment/windows-autopilot/media/pbi-dax-intro.svg
deleted file mode 100644
index c909e20844..0000000000
--- a/windows/deployment/windows-autopilot/media/pbi-dax-intro.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg id="Titles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: none;
-        stroke: #000;
-        stroke-miterlimit: 10;
-        stroke-width: 2px;
-      }
-    </style>
-  </defs>
-  <title>pbi-dax-intro</title>
-  <line class="cls-1" x1="3" y1="28" x2="61" y2="28"/>
-  <line class="cls-1" x1="3" y1="36" x2="61" y2="36"/>
-</svg>
diff --git a/windows/deployment/windows-autopilot/media/pbi-exploring-data.svg b/windows/deployment/windows-autopilot/media/pbi-exploring-data.svg
deleted file mode 100644
index 30fc0d7310..0000000000
--- a/windows/deployment/windows-autopilot/media/pbi-exploring-data.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<svg id="Titles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <defs>
-    <style>
-      .cls-1, .cls-2, .cls-3 {
-        fill: none;
-      }
-
-      .cls-1, .cls-3 {
-        stroke: #000;
-        stroke-miterlimit: 10;
-        stroke-width: 2px;
-      }
-
-      .cls-3 {
-        stroke-linecap: round;
-      }
-    </style>
-  </defs>
-  <title>pbi-exploring-data</title>
-  <polyline class="cls-1" points="8 36 2 36 2 3 48 3 48 10"/>
-  <rect class="cls-2" x="33" y="23" width="32" height="32"/>
-  <g>
-    <g>
-      <rect class="cls-2" x="16" y="17" width="48" height="48"/>
-      <rect class="cls-2" x="16" y="17" width="48" height="48"/>
-      <rect class="cls-2" x="16" y="17" width="48" height="48"/>
-    </g>
-    <line class="cls-3" x1="36.42" y1="47.58" x2="21.36" y2="62.64"/>
-    <path d="M29.72,42H9V11H53v9.05a17.88,17.88,0,0,1,2,.85V9H7V44H30.42A17.92,17.92,0,0,1,29.72,42Z"/>
-    <path class="cls-1" d="M47,22A15,15,0,1,0,62,37,15,15,0,0,0,47,22Z"/>
-  </g>
-  <rect x="12" y="27" width="4" height="14"/>
-  <rect x="18" y="16" width="4" height="25"/>
-  <rect x="24" y="20" width="4" height="21"/>
-</svg>
diff --git a/windows/deployment/windows-autopilot/media/pbi-getting-data.svg b/windows/deployment/windows-autopilot/media/pbi-getting-data.svg
deleted file mode 100644
index c589de5f4c..0000000000
--- a/windows/deployment/windows-autopilot/media/pbi-getting-data.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<svg id="Titles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #fff;
-      }
-
-      .cls-1, .cls-2 {
-        stroke: #000;
-        stroke-miterlimit: 10;
-        stroke-width: 2px;
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-    </style>
-  </defs>
-  <title>pbi-getting-data</title>
-  <line class="cls-1" x1="4.91" y1="59" x2="59" y2="4.91"/>
-  <polyline class="cls-2" points="35 5 59 5 59 29"/>
-</svg>
diff --git a/windows/deployment/windows-autopilot/media/pbi-modeling.svg b/windows/deployment/windows-autopilot/media/pbi-modeling.svg
deleted file mode 100644
index 3d498a07e6..0000000000
--- a/windows/deployment/windows-autopilot/media/pbi-modeling.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg id="Titles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: none;
-        stroke: #000;
-        stroke-miterlimit: 10;
-        stroke-width: 2px;
-      }
-    </style>
-  </defs>
-  <title>pbi-modeling</title>
-  <polyline class="cls-1" points="51.49 42 63 42 63 2 23 2 23 7.49"/>
-  <circle class="cls-1" cx="21" cy="28" r="20"/>
-  <polyline class="cls-1" points="40.54 23.95 62.48 62 20.05 62 29.29 45.99"/>
-</svg>
diff --git a/windows/deployment/windows-autopilot/media/pbi-pub-sharing.svg b/windows/deployment/windows-autopilot/media/pbi-pub-sharing.svg
deleted file mode 100644
index 9ef91e4e69..0000000000
--- a/windows/deployment/windows-autopilot/media/pbi-pub-sharing.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg id="Titles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: none;
-        stroke: #000;
-        stroke-miterlimit: 10;
-        stroke-width: 2px;
-      }
-    </style>
-  </defs>
-  <title>pbi-pub-sharing</title>
-  <path class="cls-1" d="M57.69,39A26,26,0,0,0,40,10.25"/>
-  <path class="cls-1" d="M13.24,53a26,26,0,0,0,37.52,0"/>
-  <path class="cls-1" d="M24.84,10A26,26,0,0,0,6.48,40"/>
-  <circle class="cls-1" cx="32" cy="10.5" r="7.5"/>
-  <circle class="cls-1" cx="9.5" cy="46.5" r="7.5"/>
-  <circle class="cls-1" cx="54.5" cy="46.5" r="7.5"/>
-</svg>
diff --git a/windows/deployment/windows-autopilot/media/pbi-visualizations.svg b/windows/deployment/windows-autopilot/media/pbi-visualizations.svg
deleted file mode 100644
index 3d3787f444..0000000000
--- a/windows/deployment/windows-autopilot/media/pbi-visualizations.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg id="Titles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: none;
-        stroke: #000;
-        stroke-miterlimit: 10;
-        stroke-width: 2px;
-      }
-    </style>
-  </defs>
-  <title>pbi-visualizations</title>
-  <polyline class="cls-1" points="3 3 3 61 62 61"/>
-  <rect class="cls-1" x="8" y="15" width="14" height="42"/>
-  <rect class="cls-1" x="27" y="27" width="14" height="30"/>
-  <rect class="cls-1" x="46" y="4" width="14" height="53"/>
-</svg>
diff --git a/windows/deployment/windows-autopilot/media/i_deploy.svg b/windows/deployment/windows-autopilot/test/media/i_deploy.svg
similarity index 100%
rename from windows/deployment/windows-autopilot/media/i_deploy.svg
rename to windows/deployment/windows-autopilot/test/media/i_deploy.svg
diff --git a/windows/deployment/windows-autopilot/test1.md b/windows/deployment/windows-autopilot/test/test1.md
similarity index 100%
rename from windows/deployment/windows-autopilot/test1.md
rename to windows/deployment/windows-autopilot/test/test1.md
diff --git a/windows/deployment/windows-autopilot/test2.md b/windows/deployment/windows-autopilot/test/test2.md
similarity index 100%
rename from windows/deployment/windows-autopilot/test2.md
rename to windows/deployment/windows-autopilot/test/test2.md