diff --git a/manifests/p/Python/Python/3.6.5/Python.Python.installer.yaml b/manifests/p/Python/Python/3.6.5/Python.Python.installer.yaml
new file mode 100644
index 000000000..9a7ebc259
--- /dev/null
+++ b/manifests/p/Python/Python/3.6.5/Python.Python.installer.yaml
@@ -0,0 +1,24 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.0.0.schema.json
+PackageIdentifier: Python.Python
+PackageVersion: 3.6.5
+FileExtensions:
+- py
+- pyw
+- pyc
+- pyo
+Installers:
+- Architecture: x64
+  InstallerUrl: https://www.python.org/ftp/python/3.6.5/python-3.6.5-amd64.exe
+  InstallerSha256: A518C95374BBDEEC10A144A76A04B6E05EA3D8A0773AAF0581220ABF7C9AD2C3
+  InstallerType: exe
+- Architecture: x86
+  InstallerUrl: https://www.python.org/ftp/python/3.6.5/python-3.6.5.exe
+  InstallerSha256: CAF33A6ADE83CBAE3314DEA87595D29500AE2692CB656B587FBA17009BEDF3D8
+  InstallerType: exe
+InstallerSwitches:
+  Silent: /Quiet
+  SilentWithProgress: /Passive
+  Custom: PrependPath=1
+ManifestType: installer
+ManifestVersion: 1.0.0
+
diff --git a/manifests/p/Python/Python/3.6.5/Python.Python.locale.en-US.yaml b/manifests/p/Python/Python/3.6.5/Python.Python.locale.en-US.yaml
new file mode 100644
index 000000000..8f13d6eed
--- /dev/null
+++ b/manifests/p/Python/Python/3.6.5/Python.Python.locale.en-US.yaml
@@ -0,0 +1,20 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultlocale.1.0.0.schema.json
+PackageIdentifier: Python.Python
+PackageVersion: 3.6.5
+PackageLocale: en-US
+LicenseUrl: https://docs.python.org/3/license.html
+Moniker: python
+Tags:
+- python
+- python3
+- programming language
+- script
+- glue language
+PackageUrl: https://www.python.org
+Publisher: Python
+PackageName: Python
+License: PSF LICENSE AGREEMENT FOR PYTHON
+ShortDescription: Python is a programming language that lets you work more quickly and integrate your systems more effectively.
+ManifestType: defaultLocale
+ManifestVersion: 1.0.0
+
diff --git a/manifests/p/Python/Python/3.6.5/Python.Python.yaml b/manifests/p/Python/Python/3.6.5/Python.Python.yaml
index 74b0482d2..82f7bfcf8 100644
--- a/manifests/p/Python/Python/3.6.5/Python.Python.yaml
+++ b/manifests/p/Python/Python/3.6.5/Python.Python.yaml
@@ -1,35 +1,7 @@
+# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.0.0.schema.json
 PackageIdentifier: Python.Python
-PackageName: Python
-Publisher: Python
-Author: Python
-ShortDescription: Python is a programming language that lets you work more quickly and integrate your systems more effectively.
-Tags:
-- python
-- python3
-- programming language
-- script
-- glue language
-FileExtensions:
-- py
-- pyw
-- pyc
-- pyo
-Commands:
-- python
-- py
-PackageUrl: https://www.python.org
-License: PSF LICENSE AGREEMENT FOR PYTHON
-LicenseUrl: https://docs.python.org/3/license.html
 PackageVersion: 3.6.5
-InstallerType: exe
-Installers:
-- Architecture: x64
-  InstallerUrl: https://www.python.org/ftp/python/3.6.5/python-3.6.5-amd64.exe
-  InstallerSha256: a518c95374bbdeec10a144a76a04b6e05ea3d8a0773aaf0581220abf7c9ad2c3
-  InstallerSwitches:
-    Silent: /Quiet
-    SilentWithProgress: /Passive
-    Custom: PrependPath=1
-PackageLocale: en-US
-ManifestType: singleton
+DefaultLocale: en-US
+ManifestType: version
 ManifestVersion: 1.0.0
+