diff --git a/generate/msvc2017/AcpiComponents.sln b/generate/msvc2017/AcpiComponents.sln
index a1ca5efac..e602cd99e 100755
--- a/generate/msvc2017/AcpiComponents.sln
+++ b/generate/msvc2017/AcpiComponents.sln
@@ -23,6 +23,60 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AslCompiler", "AslCompiler.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Examples", "Examples.vcxproj", "{D041B261-FCCD-4EA8-B611-6ACF09C51100}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Makefiles", "Makefiles", "{4E91BFEE-5B47-4E44-A98E-9920BD5C262E}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\Makefile = ..\unix\Makefile
+		..\unix\Makefile.common = ..\unix\Makefile.common
+		..\unix\Makefile.config = ..\unix\Makefile.config
+		..\unix\Makefile.rules = ..\unix\Makefile.rules
+		..\unix\readme.txt = ..\unix\readme.txt
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiBin", "AcpiBin", "{B88AD4DD-990E-4904-A317-BCA3FBDB1AA9}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\acpibin\Makefile = ..\unix\acpibin\Makefile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiDump", "AcpiDump", "{5BBBEDF7-F887-4D85-8C8B-A892752B71C3}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\acpidump\Makefile = ..\unix\acpidump\Makefile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiExec", "AcpiExec", "{D8E8013C-5740-41AD-8053-A04FC2519155}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\acpiexec\Makefile = ..\unix\acpiexec\Makefile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiHelp", "AcpiHelp", "{203AF658-377B-4088-88DF-DE384C96A95A}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\acpihelp\Makefile = ..\unix\acpihelp\Makefile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiNames", "AcpiNames", "{9A4B4717-5624-4DFA-A7A5-D0D838D5A56C}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\acpinames\Makefile = ..\unix\acpinames\Makefile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiSrc", "AcpiSrc", "{7C545DE1-E27C-4AEF-A008-8976469EDA80}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\acpisrc\Makefile = ..\unix\acpisrc\Makefile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiXtract", "AcpiXtract", "{98A33210-5764-4F95-89ED-EEE50DF5611C}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\acpixtract\Makefile = ..\unix\acpixtract\Makefile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AslCompiler", "AslCompiler", "{EDB04702-9BFE-4C6D-A471-F921F99593EF}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\iasl\Makefile = ..\unix\iasl\Makefile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AcpiExamples", "AcpiExamples", "{362D21E6-E07D-43FC-B8E3-D316707A6120}"
+	ProjectSection(SolutionItems) = preProject
+		..\unix\acpiexamples\Makefile = ..\unix\acpiexamples\Makefile
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -94,6 +148,17 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{B88AD4DD-990E-4904-A317-BCA3FBDB1AA9} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
+		{5BBBEDF7-F887-4D85-8C8B-A892752B71C3} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
+		{D8E8013C-5740-41AD-8053-A04FC2519155} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
+		{203AF658-377B-4088-88DF-DE384C96A95A} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
+		{9A4B4717-5624-4DFA-A7A5-D0D838D5A56C} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
+		{7C545DE1-E27C-4AEF-A008-8976469EDA80} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
+		{98A33210-5764-4F95-89ED-EEE50DF5611C} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
+		{EDB04702-9BFE-4C6D-A471-F921F99593EF} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
+		{362D21E6-E07D-43FC-B8E3-D316707A6120} = {4E91BFEE-5B47-4E44-A98E-9920BD5C262E}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2A8D1EBA-9685-4686-A7F5-6351935D4EBB}
 	EndGlobalSection
diff --git a/generate/msvc2017/AslCompiler.vcxproj.filters b/generate/msvc2017/AslCompiler.vcxproj.filters
index bf8a2a4ef..9b92ed6e4 100755
--- a/generate/msvc2017/AslCompiler.vcxproj.filters
+++ b/generate/msvc2017/AslCompiler.vcxproj.filters
@@ -33,9 +33,6 @@
     <Filter Include="Source Files\Interpreter">
       <UniqueIdentifier>{4aa50d35-2e23-479b-9942-b47651f3fdc1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Parser">
-      <UniqueIdentifier>{ff23bd4f-21e6-4c96-b566-dd21428f34c4}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\Dispatcher">
       <UniqueIdentifier>{613032b5-8813-493e-8495-c0cd03cf0ccf}</UniqueIdentifier>
     </Filter>
@@ -50,6 +47,12 @@
       <UniqueIdentifier>{a332cafa-1381-4270-82b3-86c6cb9ffa3d}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
+    <Filter Include="Source Files\Parsers">
+      <UniqueIdentifier>{00e748ce-f6ea-442b-8c79-9fbc1ab72f77}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Aml Parser">
+      <UniqueIdentifier>{ff23bd4f-21e6-4c96-b566-dd21428f34c4}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\source\components\utilities\utaddress.c">
@@ -530,46 +533,46 @@
       <Filter>Source Files\Interpreter</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\compiler\prexpress.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\compiler\prmacros.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\compiler\prscan.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\compiler\prutils.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\psargs.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\psloop.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\psobject.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\psopcode.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\psopinfo.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\psparse.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\psscope.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\pstree.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\psutils.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\parser\pswalk.c">
-      <Filter>Source Files\Parser</Filter>
+      <Filter>Source Files\Aml Parser</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\components\dispatcher\dsargs.c">
       <Filter>Source Files\Dispatcher</Filter>
@@ -713,14 +716,32 @@
     <Text Include="..\..\source\compiler\readme.txt" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\source\compiler\aslcompiler.y" />
-    <CustomBuild Include="..\..\source\compiler\aslparser.y" />
-    <CustomBuild Include="..\..\source\compiler\dtparser.l" />
-    <CustomBuild Include="..\..\source\compiler\dtparser.y" />
-    <CustomBuild Include="..\..\source\compiler\prparser.l" />
-    <CustomBuild Include="..\..\source\compiler\prparser.y" />
-    <CustomBuild Include="..\..\source\compiler\dtcompilerparser.l" />
-    <CustomBuild Include="..\..\source\compiler\dtcompilerparser.y" />
-    <CustomBuild Include="..\..\source\compiler\aslcompiler.l" />
+    <CustomBuild Include="..\..\source\compiler\aslcompiler.l">
+      <Filter>Source Files\Parsers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\source\compiler\aslcompiler.y">
+      <Filter>Source Files\Parsers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\source\compiler\aslparser.y">
+      <Filter>Source Files\Parsers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\source\compiler\dtcompilerparser.l">
+      <Filter>Source Files\Parsers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\source\compiler\dtcompilerparser.y">
+      <Filter>Source Files\Parsers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\source\compiler\dtparser.l">
+      <Filter>Source Files\Parsers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\source\compiler\dtparser.y">
+      <Filter>Source Files\Parsers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\source\compiler\prparser.l">
+      <Filter>Source Files\Parsers</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\source\compiler\prparser.y">
+      <Filter>Source Files\Parsers</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file