diff --git a/EAPMethods/EAPTTLSUI/.gitignore b/EAPMethods/EAPTTLSUI/.gitignore
deleted file mode 100644
index 9c8716a..0000000
--- a/EAPMethods/EAPTTLSUI/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/temp
-/*.user
diff --git a/EAPMethods/EAPTTLS/.gitignore b/EAPMethods/build/.gitignore
similarity index 100%
rename from EAPMethods/EAPTTLS/.gitignore
rename to EAPMethods/build/.gitignore
diff --git a/EAPMethods/EAPTTLS/EAPTTLS.props b/EAPMethods/build/EAPTTLS.props
similarity index 77%
rename from EAPMethods/EAPTTLS/EAPTTLS.props
rename to EAPMethods/build/EAPTTLS.props
index 3297799..344008b 100644
--- a/EAPMethods/EAPTTLS/EAPTTLS.props
+++ b/EAPMethods/build/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="..\build\Common.props" />
+    <Import Project="Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -10,7 +10,7 @@
       <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>..\build\EAPMethod.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>EAPMethod.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj b/EAPMethods/build/EAPTTLS.vcxproj
similarity index 96%
rename from EAPMethods/EAPTTLS/EAPTTLS.vcxproj
rename to EAPMethods/build/EAPTTLS.vcxproj
index d4d4473..069dd1b 100644
--- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
+++ b/EAPMethods/build/EAPTTLS.vcxproj
@@ -121,11 +121,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemGroup>
-    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\Main.cpp" />
-    <ClCompile Include="StdAfx.cpp">
+    <ClCompile Include="..\src\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>
@@ -135,7 +135,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="EAPTTLS.rc" />
+    <ResourceCompile Include="..\res\EAPTTLS.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
@@ -167,7 +167,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\build\EAPMethod.def" />
+    <None Include="EAPMethod.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters b/EAPMethods/build/EAPTTLS.vcxproj.filters
similarity index 85%
rename from EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters
rename to EAPMethods/build/EAPTTLS.vcxproj.filters
index c8b78e0..4e76ff0 100644
--- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters
+++ b/EAPMethods/build/EAPTTLS.vcxproj.filters
@@ -15,12 +15,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="StdAfx.h">
+    <ClInclude Include="..\src\StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="StdAfx.cpp">
+    <ClCompile Include="..\src\StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\Main.cpp">
@@ -28,12 +28,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="EAPTTLS.rc">
+    <ResourceCompile Include="..\res\EAPTTLS.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\build\EAPMethod.def">
+    <None Include="EAPMethod.def">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.props b/EAPMethods/build/EAPTTLSUI.props
similarity index 72%
rename from EAPMethods/EAPTTLSUI/EAPTTLSUI.props
rename to EAPMethods/build/EAPTTLSUI.props
index 5dfeb3b..67b3619 100644
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.props
+++ b/EAPMethods/build/EAPTTLSUI.props
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="..\build\Common.props" />
+    <Import Project="Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>EAPMETHOD_TYPE=21;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>StdAfxUI.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
-      <ModuleDefinitionFile>..\build\EAPMethodUI.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>EAPMethodUI.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/build/EAPTTLSUI.vcxproj
similarity index 96%
rename from EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
rename to EAPMethods/build/EAPTTLSUI.vcxproj
index e3e0b9e..11b1284 100644
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
+++ b/EAPMethods/build/EAPTTLSUI.vcxproj
@@ -121,11 +121,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <ItemGroup>
-    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="..\src\StdAfxUI.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\Main_UI.cpp" />
-    <ClCompile Include="StdAfx.cpp">
+    <ClCompile Include="..\src\MainUI.cpp" />
+    <ClCompile Include="..\src\StdAfxUI.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>
@@ -135,7 +135,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="EAPTTLSUI.rc" />
+    <ResourceCompile Include="..\res\EAPTTLSUI.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
@@ -191,7 +191,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\build\EAPMethodUI.def" />
+    <None Include="EAPMethodUI.def" />
     <None Include="..\locale\EAPMethods.pot" />
   </ItemGroup>
   <ItemGroup>
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters b/EAPMethods/build/EAPTTLSUI.vcxproj.filters
similarity index 93%
rename from EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
rename to EAPMethods/build/EAPTTLSUI.vcxproj.filters
index 8f8c68a..e3fb9d7 100644
--- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
+++ b/EAPMethods/build/EAPTTLSUI.vcxproj.filters
@@ -19,25 +19,25 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="StdAfx.h">
+    <ClInclude Include="..\src\StdAfxUI.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="StdAfx.cpp">
+    <ClCompile Include="..\src\StdAfxUI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Main_UI.cpp">
+    <ClCompile Include="..\src\MainUI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="EAPTTLSUI.rc">
+    <ResourceCompile Include="..\res\EAPTTLSUI.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\build\EAPMethodUI.def">
+    <None Include="EAPMethodUI.def">
       <Filter>Source Files</Filter>
     </None>
     <None Include="..\locale\EAPMethods.pot">
diff --git a/EAPMethods/EAPTTLS/EAPTTLS.rc b/EAPMethods/res/EAPTTLS.rc
similarity index 98%
rename from EAPMethods/EAPTTLS/EAPTTLS.rc
rename to EAPMethods/res/EAPTTLS.rc
index 26fc82d..3246ddb 100644
Binary files a/EAPMethods/EAPTTLS/EAPTTLS.rc and b/EAPMethods/res/EAPTTLS.rc differ
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc b/EAPMethods/res/EAPTTLSUI.rc
similarity index 98%
rename from EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
rename to EAPMethods/res/EAPTTLSUI.rc
index 4d84316..7f22d05 100644
Binary files a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc and b/EAPMethods/res/EAPTTLSUI.rc differ
diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp
index 6734d31..4e28968 100644
--- a/EAPMethods/src/Main.cpp
+++ b/EAPMethods/src/Main.cpp
@@ -18,7 +18,7 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <StdAfx.h>
+#include "StdAfx.h"
 
 using namespace std;
 using namespace winstd;
diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/src/MainUI.cpp
similarity index 97%
rename from EAPMethods/src/Main_UI.cpp
rename to EAPMethods/src/MainUI.cpp
index 1a9daa9..c1b52cd 100644
--- a/EAPMethods/src/Main_UI.cpp
+++ b/EAPMethods/src/MainUI.cpp
@@ -18,7 +18,7 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <StdAfx.h>
+#include "StdAfxUI.h"
 
 #pragma comment(lib, "msxml6.lib")
 
diff --git a/EAPMethods/EAPTTLS/StdAfx.cpp b/EAPMethods/src/StdAfx.cpp
similarity index 100%
rename from EAPMethods/EAPTTLS/StdAfx.cpp
rename to EAPMethods/src/StdAfx.cpp
diff --git a/EAPMethods/EAPTTLS/StdAfx.h b/EAPMethods/src/StdAfx.h
similarity index 100%
rename from EAPMethods/EAPTTLS/StdAfx.h
rename to EAPMethods/src/StdAfx.h
diff --git a/EAPMethods/EAPTTLSUI/StdAfx.cpp b/EAPMethods/src/StdAfxUI.cpp
similarity index 59%
rename from EAPMethods/EAPTTLSUI/StdAfx.cpp
rename to EAPMethods/src/StdAfxUI.cpp
index e1706a9..5a1ef45 100644
--- a/EAPMethods/EAPTTLSUI/StdAfx.cpp
+++ b/EAPMethods/src/StdAfxUI.cpp
@@ -1,21 +1,21 @@
 /*
     Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
+    Copyright 2016 GÉANT
 
-    This file is part of GÉANTLink.
+    This file is part of GÉANTLink.
 
-    GÉANTLink is free software: you can redistribute it and/or modify it
+    GÉANTLink is free software: you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    GÉANTLink is distributed in the hope that it will be useful, but
+    GÉANTLink is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "StdAfx.h"
+#include "StdAfxUI.h"
diff --git a/EAPMethods/EAPTTLSUI/StdAfx.h b/EAPMethods/src/StdAfxUI.h
similarity index 100%
rename from EAPMethods/EAPTTLSUI/StdAfx.h
rename to EAPMethods/src/StdAfxUI.h
diff --git a/GEANTLink.sln b/GEANTLink.sln
index 6055d67..ec6a4bb 100644
--- a/GEANTLink.sln
+++ b/GEANTLink.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2016
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{14D5FE5B-9742-4D1F-A1E0-32E694B94AAB}"
 	ProjectSection(SolutionItems) = preProject
@@ -11,7 +11,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\EAPTTLS\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\build\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}"
 EndProject
@@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\Cred
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\EAPTTLSUI\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLSUI", "EAPMethods\build\EAPTTLSUI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}"
 EndProject