diff --git a/EAPMethods/build/.gitignore b/EAPMethods/EAPMethodEvents/.gitignore
similarity index 100%
rename from EAPMethods/build/.gitignore
rename to EAPMethods/EAPMethodEvents/.gitignore
diff --git a/EAPMethods/build/EAPMethodEvents.props b/EAPMethods/EAPMethodEvents/EAPMethodEvents.props
similarity index 86%
rename from EAPMethods/build/EAPMethodEvents.props
rename to EAPMethods/EAPMethodEvents/EAPMethodEvents.props
index dfcde04..2dcbd89 100644
--- a/EAPMethods/build/EAPMethodEvents.props
+++ b/EAPMethods/EAPMethodEvents/EAPMethodEvents.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="..\..\include\ResourceDLL.props" />
-    <Import Project="Common.props" />
+    <Import Project="..\build\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
diff --git a/EAPMethods/build/EAPMethodEvents.rc b/EAPMethods/EAPMethodEvents/EAPMethodEvents.rc
similarity index 100%
rename from EAPMethods/build/EAPMethodEvents.rc
rename to EAPMethods/EAPMethodEvents/EAPMethodEvents.rc
diff --git a/EAPMethods/build/EAPMethodEvents.vcxproj b/EAPMethods/EAPMethodEvents/EAPMethodEvents.vcxproj
similarity index 100%
rename from EAPMethods/build/EAPMethodEvents.vcxproj
rename to EAPMethods/EAPMethodEvents/EAPMethodEvents.vcxproj
diff --git a/EAPMethods/build/EAPMethodEvents.vcxproj.filters b/EAPMethods/EAPMethodEvents/EAPMethodEvents.vcxproj.filters
similarity index 100%
rename from EAPMethods/build/EAPMethodEvents.vcxproj.filters
rename to EAPMethods/EAPMethodEvents/EAPMethodEvents.vcxproj.filters
diff --git a/EAPMethods/EAPTTLS/.gitignore b/EAPMethods/EAPTTLS/.gitignore
new file mode 100644
index 0000000..9c8716a
--- /dev/null
+++ b/EAPMethods/EAPTTLS/.gitignore
@@ -0,0 +1,2 @@
+/temp
+/*.user
diff --git a/EAPMethods/build/EAPTTLS.props b/EAPMethods/EAPTTLS/EAPTTLS.props
similarity index 77%
rename from EAPMethods/build/EAPTTLS.props
rename to EAPMethods/EAPTTLS/EAPTTLS.props
index 344008b..3297799 100644
--- a/EAPMethods/build/EAPTTLS.props
+++ b/EAPMethods/EAPTTLS/EAPTTLS.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
+    <Import Project="..\build\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -10,7 +10,7 @@
       <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>EAPMethod.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>..\build\EAPMethod.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/EAPMethods/build/EAPTTLS.rc b/EAPMethods/EAPTTLS/EAPTTLS.rc
similarity index 100%
rename from EAPMethods/build/EAPTTLS.rc
rename to EAPMethods/EAPTTLS/EAPTTLS.rc
diff --git a/EAPMethods/build/EAPTTLS.vcxproj b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
similarity index 95%
rename from EAPMethods/build/EAPTTLS.vcxproj
rename to EAPMethods/EAPTTLS/EAPTTLS.vcxproj
index d52c307..a3f0d25 100644
--- a/EAPMethods/build/EAPTTLS.vcxproj
+++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
@@ -85,7 +85,7 @@
     <ClInclude Include="..\include\EAPTTLS.h" />
     <ClInclude Include="..\include\EAPXML.h" />
     <ClInclude Include="..\include\PAP.h" />
-    <ClInclude Include="..\include\StdAfx.h" />
+    <ClInclude Include="StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\EAPMethods.cpp" />
@@ -93,7 +93,7 @@
     <ClCompile Include="..\src\EAPTTLS.cpp" />
     <ClCompile Include="..\src\Main.cpp" />
     <ClCompile Include="..\src\PAP.cpp" />
-    <ClCompile Include="..\src\StdAfx.cpp">
+    <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -107,12 +107,12 @@
     <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
-    <ProjectReference Include="EAPMethodEvents.vcxproj">
+    <ProjectReference Include="..\EAPMethodEvents\EAPMethodEvents.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="EAPMethod.def" />
+    <None Include="..\build\EAPMethod.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/EAPMethods/build/EAPTTLS.vcxproj.filters b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters
similarity index 93%
rename from EAPMethods/build/EAPTTLS.vcxproj.filters
rename to EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters
index ba6bfa7..fb406e4 100644
--- a/EAPMethods/build/EAPTTLS.vcxproj.filters
+++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\StdAfx.h">
+    <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\EAPMethods.h">
@@ -38,7 +38,7 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\StdAfx.cpp">
+    <ClCompile Include="StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\Main.cpp">
diff --git a/EAPMethods/src/StdAfx.cpp b/EAPMethods/EAPTTLS/StdAfx.cpp
similarity index 97%
rename from EAPMethods/src/StdAfx.cpp
rename to EAPMethods/EAPTTLS/StdAfx.cpp
index 3b5d959..acfd805 100644
Binary files a/EAPMethods/src/StdAfx.cpp and b/EAPMethods/EAPTTLS/StdAfx.cpp differ
diff --git a/EAPMethods/EAPTTLS/StdAfx.h b/EAPMethods/EAPTTLS/StdAfx.h
new file mode 100644
index 0000000..f08fbf8
Binary files /dev/null and b/EAPMethods/EAPTTLS/StdAfx.h differ
diff --git a/EAPMethods/EAPTTLSUI/.gitignore b/EAPMethods/EAPTTLSUI/.gitignore
new file mode 100644
index 0000000..9c8716a
--- /dev/null
+++ b/EAPMethods/EAPTTLSUI/.gitignore
@@ -0,0 +1,2 @@
+/temp
+/*.user
diff --git a/EAPMethods/build/EAPTTLSUI.props b/EAPMethods/EAPTTLSUI/EAPTTLSUI.props
similarity index 77%
rename from EAPMethods/build/EAPTTLSUI.props
rename to EAPMethods/EAPTTLSUI/EAPTTLSUI.props
index c94e3c6..5dfeb3b 100644
--- a/EAPMethods/build/EAPTTLSUI.props
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
+    <Import Project="..\build\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -10,7 +10,7 @@
       <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>EAPMethodUI.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>..\build\EAPMethodUI.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/EAPMethods/build/EAPTTLSUI.rc b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
similarity index 100%
rename from EAPMethods/build/EAPTTLSUI.rc
rename to EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
diff --git a/EAPMethods/build/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
similarity index 93%
rename from EAPMethods/build/EAPTTLSUI.vcxproj
rename to EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
index 17a1eab..e9bb5a7 100644
--- a/EAPMethods/build/EAPTTLSUI.vcxproj
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
@@ -82,7 +82,9 @@
     <ClInclude Include="..\include\EAPMethods.h" />
     <ClInclude Include="..\include\EAPTLS.h" />
     <ClInclude Include="..\include\EAPTTLS.h" />
-    <ClInclude Include="..\include\StdAfx.h" />
+    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="..\res\EAPTLSUI.h" />
+    <ClInclude Include="..\res\EAPTTLSUI.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\EAPMethods.cpp" />
@@ -90,7 +92,7 @@
     <ClCompile Include="..\src\EAPTTLS.cpp" />
     <ClCompile Include="..\src\MainUI.cpp" />
     <ClCompile Include="..\src\PAP.cpp" />
-    <ClCompile Include="..\src\StdAfx.cpp">
+    <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -104,12 +106,12 @@
     <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
-    <ProjectReference Include="EAPMethodEvents.vcxproj">
+    <ProjectReference Include="..\EAPMethodEvents\EAPMethodEvents.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="EAPMethodUI.def" />
+    <None Include="..\build\EAPMethodUI.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/EAPMethods/build/EAPTTLSUI.vcxproj.filters b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
similarity index 83%
rename from EAPMethods/build/EAPTTLSUI.vcxproj.filters
rename to EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
index 812bb54..7de2a85 100644
--- a/EAPMethods/build/EAPTTLSUI.vcxproj.filters
+++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\StdAfx.h">
+    <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\include\EAPMethods.h">
@@ -27,9 +27,15 @@
     <ClInclude Include="..\include\EAPTLS.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\res\EAPTLSUI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\res\EAPTTLSUI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\StdAfx.cpp">
+    <ClCompile Include="StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\MainUI.cpp">
@@ -54,7 +60,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="EAPMethodUI.def">
+    <None Include="..\build\EAPMethodUI.def">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
diff --git a/EAPMethods/EAPTTLSUI/StdAfx.cpp b/EAPMethods/EAPTTLSUI/StdAfx.cpp
new file mode 100644
index 0000000..acfd805
Binary files /dev/null and b/EAPMethods/EAPTTLSUI/StdAfx.cpp differ
diff --git a/EAPMethods/include/StdAfx.h b/EAPMethods/EAPTTLSUI/StdAfx.h
similarity index 100%
rename from EAPMethods/include/StdAfx.h
rename to EAPMethods/EAPTTLSUI/StdAfx.h
diff --git a/EAPMethods/build/Common.props b/EAPMethods/build/Common.props
index ef07f34..33fe726 100644
--- a/EAPMethods/build/Common.props
+++ b/EAPMethods/build/Common.props
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>temp\EAPMethodEvents.$(Platform).$(Configuration).$(PlatformToolset);..\include;..\..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\EAPMethodEvents\temp\EAPMethodEvents.$(Platform).$(Configuration).$(PlatformToolset);..\include;..\..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>temp\EAPMethodEvents.$(Platform).$(Configuration).$(PlatformToolset);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/EAPMethods/include/EAPMethods.h b/EAPMethods/include/EAPMethods.h
index 470ee9e..abb1acb 100644
Binary files a/EAPMethods/include/EAPMethods.h and b/EAPMethods/include/EAPMethods.h differ
diff --git a/VS10Solution.sln b/VS10Solution.sln
index 29e8efe..e576106 100644
--- a/VS10Solution.sln
+++ b/VS10Solution.sln
@@ -8,7 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EAP Methods", "EAP Methods", "{60BAAC3D-DC98-4C19-BC40-1A86963DE86C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\build\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\EAPTTLS\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}"
 EndProject
@@ -18,9 +18,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPMethodEvents", "EAPMethods\build\EAPMethodEvents.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPMethodEvents", "EAPMethods\EAPMethodEvents\EAPMethodEvents.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\build\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\EAPTTLSUI\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution