11 files changed, 94 insertions, 71 deletions
diff --git a/avstream/avscamera/README.md b/avstream/avscamera/README.md
index ef956c88..8a76bfc4 100644
--- a/avstream/avscamera/README.md
+++ b/avstream/avscamera/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: AvsCamera - AVStream Camera Sample Driver
+description: Provides a pin-centric AVStream capture driver for a simulated front and back camera that performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: AvsCamera - AVStream Camera Sample Driver
     platform: WDM
@@ -7,8 +17,8 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620184
 --->
 
-AvsCamera: AVStream Camera Sample Driver 
-========================================
+# AvsCamera: AVStream Camera Sample Driver
+
 The AvsCamera sample provides a pin-centric AVStream capture driver for a simulated front and back camera. The driver performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates. The purpose of the sample is to demonstrate how to write a fully functional AVStream camera driver. 
 
 This sample features strong parameter validation and overflow detection.  It provides validation and simulation logic for all advanced camera controls in the CCaptureFilter class.  A real camera driver would replace the filter automation table and CSensor and CSynthesizer class hierarchies to produce a new camera driver.
@@ -16,7 +26,9 @@ This sample features strong parameter validation and overflow detection.  It pro
 The sample comes with its own MFT0 called AvsCameraMft0.dll.  This MFT0 is used to parse metadata supplied in the AvsCamera driver samples.  The metadata communications from the driver is primarily a private channel to its MFT0.  The MFT0 is responsible for reformatting that information for the capture pipeline.
 
 ## Universal Windows Driver Compliant
+
 This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.  The sample works on 32-bit and 64-bit x86, amd64 and arm platforms.  Once installed, the simulated camera should show in the Windows Inbox camera app.
 
 ## Building the sample
-The AvsCamera sample can be built by opening the AvsCamera.sln solution file. A successful build produces AvsCamera.sys, AvsCameraMft0.dll, AvsCamera.inf and AvsCamera.cat. 
+
+The AvsCamera sample can be built by opening the AvsCamera.sln solution file. A successful build produces AvsCamera.sys, AvsCameraMft0.dll, AvsCamera.inf and AvsCamera.cat.
diff --git a/avstream/avscamera/avstream-avscamera.yml b/avstream/avscamera/avstream-avscamera.yml
deleted file mode 100644
index 25e4b8e9..00000000
--- a/avstream/avscamera/avstream-avscamera.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: AvsCamera - AVStream Camera Sample Driver
-  description: Provides a pin-centric AVStream capture driver for a simulated front and back camera that performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /avstream/avscamera/avscamera.sln
diff --git a/avstream/avscamera/mft0/README.md b/avstream/avscamera/mft0/README.md
new file mode 100644
index 00000000..8a76bfc4
--- /dev/null
+++ b/avstream/avscamera/mft0/README.md
@@ -0,0 +1,34 @@
+---
+topic: sample
+name: AvsCamera - AVStream Camera Sample Driver
+description: Provides a pin-centric AVStream capture driver for a simulated front and back camera that performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates.
+languages:
+  - cpp
+products:
+  - windows
+---
+
+<!---
+    name: AvsCamera - AVStream Camera Sample Driver
+    platform: WDM
+    language: cpp
+    category: Camera AVStream
+    description: Provides a pin-centric AVStream capture driver for a simulated front and back camera that performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620184
+--->
+
+# AvsCamera: AVStream Camera Sample Driver
+
+The AvsCamera sample provides a pin-centric AVStream capture driver for a simulated front and back camera. The driver performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates. The purpose of the sample is to demonstrate how to write a fully functional AVStream camera driver. 
+
+This sample features strong parameter validation and overflow detection.  It provides validation and simulation logic for all advanced camera controls in the CCaptureFilter class.  A real camera driver would replace the filter automation table and CSensor and CSynthesizer class hierarchies to produce a new camera driver.
+
+The sample comes with its own MFT0 called AvsCameraMft0.dll.  This MFT0 is used to parse metadata supplied in the AvsCamera driver samples.  The metadata communications from the driver is primarily a private channel to its MFT0.  The MFT0 is responsible for reformatting that information for the capture pipeline.
+
+## Universal Windows Driver Compliant
+
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.  The sample works on 32-bit and 64-bit x86, amd64 and arm platforms.  Once installed, the simulated camera should show in the Windows Inbox camera app.
+
+## Building the sample
+
+The AvsCamera sample can be built by opening the AvsCamera.sln solution file. A successful build produces AvsCamera.sys, AvsCameraMft0.dll, AvsCamera.inf and AvsCamera.cat.
diff --git a/avstream/avshws/README.md b/avstream/avshws/README.md
index 9474ae60..4571ce5e 100644
--- a/avstream/avshws/README.md
+++ b/avstream/avshws/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: AVStream simulated hardware sample driver (Avshws)
+description: A simulated hardware sample driver providing a pin-centric capture driver to simulate AV capture hardware.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: AVStream simulated hardware sample driver (Avshws)
     platform: WDM
@@ -7,8 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620185
 --->
 
-AVStream simulated hardware sample driver (Avshws)
-==================================================
+# AVStream simulated hardware sample driver (Avshws)
 
 The AVStream simulated hardware sample driver (Avshws) provides a pin-centric [AVStream](http://msdn.microsoft.com/en-us/library/windows/hardware/ff554240) capture driver for a simulated piece of hardware. This streaming media driver performs video captures at 320 x 240 pixels in either RGB24 or YUV422 format using direct memory access (DMA) into capture buffers. The purpose of the sample is to demonstrate how to write a pin-centric AVStream minidriver. The sample also shows how to implement DMA by using the related functionality provided by the AVStream class driver.
 
diff --git a/avstream/avshws/avstream-avshws.yml b/avstream/avshws/avstream-avshws.yml
deleted file mode 100644
index fb3799fc..00000000
--- a/avstream/avshws/avstream-avshws.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: AVStream simulated hardware sample driver (Avshws)
-  description: A simulated hardware sample driver providing a pin-centric capture driver to simulate AV capture hardware.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /avstream/avshws/avshws.sln
diff --git a/avstream/avssamp/README.md b/avstream/avssamp/README.md
index 979dda3c..ec5b07e4 100644
--- a/avstream/avssamp/README.md
+++ b/avstream/avssamp/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: AVStream filter-centric simulated capture sample driver (Avssamp)
+description: An AVStream filter-centric simulated capture sample driver with functional audio.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: AVStream filter-centric simulated capture sample driver (Avssamp)
     platform: WDM
@@ -7,8 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620186
 --->
 
-AVStream filter-centric simulated capture sample driver (Avssamp)
-=================================================================
+# AVStream filter-centric simulated capture sample driver (Avssamp)
 
 The AVStream filter-centric simulated capture sample driver (Avssamp) provides a filter-centric [AVStream](http://msdn.microsoft.com/en-us/library/windows/hardware/ff554240) capture driver with functional audio. This streaming media driver performs video captures at 320 x 240 pixel resolution in RGB24 or YUV422 format while playing a user-provided Pulse Code Modulation (PCM) wave audio file in a loop. The sample demonstrates how to write a filter-centric AVStream minidriver.
 
diff --git a/avstream/avssamp/avstream-avssamp.yml b/avstream/avssamp/avstream-avssamp.yml
deleted file mode 100644
index 9b36d54b..00000000
--- a/avstream/avssamp/avstream-avssamp.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: AVStream filter-centric simulated capture sample driver (Avssamp)
-  description: An AVStream filter-centric simulated capture sample driver with functional audio.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /avstream/avssamp/avssamp.sln
diff --git a/avstream/sampledevicemft/README.md b/avstream/sampledevicemft/README.md
index 79ddc9f0..ecb5e9c6 100644
--- a/avstream/sampledevicemft/README.md
+++ b/avstream/sampledevicemft/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Driver Device Transform Sample
+description: A driver device transform which loads in a process streaming an Avstream based camera device using Media Foundation.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Driver Device Transform Sample
     platform: WDM
@@ -7,8 +17,8 @@
     samplefwlink: https://go.microsoft.com/fwlink/?linkid=866747
 --->
 
-Driver Device Transform Sample
-==============================
+# Driver Device Transform Sample
+
 Illustrative example for a *Driver Device Transform* which loads in a process streaming an Avstream based camera device using Media Foundation. 
 
 A *Driver Device Transform* is a new kind of a transform that's used with a specific camera when capturing video. The *Driver Device Transform* is also known as DeviceMFT because it is the first Device Transform applied to the video source. This *Driver Device Transform* is an alternative to the Driver MFT i.e. MFT0  in that, it caters to the source rather than the streams . An N stream source supporting DeviceMFT will have a single instance of the *Device Driver Transform* loaded, while MFT0 will have *N* instances for each pipeline process. The DeviceMFT can advertise multiple streams at the output, which can differ from the number of streams advertised by the source. This is analogous to having a user mode driver in the MF pipeline which intercepts and processes commands before they enter/ leave the Kernel mode driver loaded for the streaming source.
diff --git a/avstream/sampledevicemft/avstream-sampledevicemft.yml b/avstream/sampledevicemft/avstream-sampledevicemft.yml
deleted file mode 100644
index 84ffd6d0..00000000
--- a/avstream/sampledevicemft/avstream-sampledevicemft.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Driver Device Transform Sample
-  description: A driver device transform which loads in a process streaming an Avstream based camera device using Media Foundation.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /avstream/sampledevicemft/SampleDeviceMft.sln
diff --git a/avstream/samplemft0/README.md b/avstream/samplemft0/README.md
index 111d4073..f7be80e5 100644
--- a/avstream/samplemft0/README.md
+++ b/avstream/samplemft0/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Driver MFT Sample
+description: A driver MFT for use with a camera's Windows device app.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Driver MFT Sample
     platform: WDM
@@ -7,8 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617126
 --->
 
-Driver MFT Sample
-=================
+# Driver MFT Sample
 
 Provides a *driver MFT* for use with a camera's UWP device app.A *driver MFT* is a Media Foundation Transform that's used with a specific camera when capturing video. The driver MFT is also known as MFT0 because it is the first MFT applied to the video stream captured from the camera. This MFT can provide a video effect or other processing when capturing photos or video from the camera. It can be distributed along with the driver package for a camera.
 
diff --git a/avstream/samplemft0/avstream-samplemft0.yml b/avstream/samplemft0/avstream-samplemft0.yml
deleted file mode 100644
index 5a4e4c0a..00000000
--- a/avstream/samplemft0/avstream-samplemft0.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Driver MFT Sample
-  description: A driver MFT for use with a camera's Windows device app.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /avstream/samplemft0/SampleMft0.sln