diff --git a/libatl.sln b/atlex.sln
similarity index 100%
rename from libatl.sln
rename to atlex.sln
diff --git a/build/atlex.props b/build/atlex.props
index be71480..ba068ee 100644
--- a/build/atlex.props
+++ b/build/atlex.props
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include\atlex</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
     </ClCompile>
diff --git a/build/atlex.vcxproj b/build/atlex.vcxproj
index 13115dd..8efadb3 100644
--- a/build/atlex.vcxproj
+++ b/build/atlex.vcxproj
@@ -102,15 +102,15 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\atlcrypt.h" />
-    <ClInclude Include="..\include\atleap.h" />
-    <ClInclude Include="..\include\atlex.h" />
-    <ClInclude Include="..\include\atlmsi.h" />
-    <ClInclude Include="..\include\atlsec.h" />
-    <ClInclude Include="..\include\atlshlwapi.h" />
-    <ClInclude Include="..\include\atlwin.h" />
-    <ClInclude Include="..\include\atlwlan.h" />
-    <ClInclude Include="..\include\stdafx.h" />
+    <ClInclude Include="..\include\atlex\atlcrypt.h" />
+    <ClInclude Include="..\include\atlex\atleap.h" />
+    <ClInclude Include="..\include\atlex\atlex.h" />
+    <ClInclude Include="..\include\atlex\atlmsi.h" />
+    <ClInclude Include="..\include\atlex\atlsec.h" />
+    <ClInclude Include="..\include\atlex\atlshlwapi.h" />
+    <ClInclude Include="..\include\atlex\atlwin.h" />
+    <ClInclude Include="..\include\atlex\atlwlan.h" />
+    <ClInclude Include="..\src\stdafx.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/atlex.vcxproj.filters b/build/atlex.vcxproj.filters
index 5cb2b60..a72b441 100644
--- a/build/atlex.vcxproj.filters
+++ b/build/atlex.vcxproj.filters
@@ -16,31 +16,31 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\stdafx.h">
+    <ClInclude Include="..\src\stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\atlwin.h">
+    <ClInclude Include="..\include\atlex\atlwin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\atlmsi.h">
+    <ClInclude Include="..\include\atlex\atlmsi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\atlcrypt.h">
+    <ClInclude Include="..\include\atlex\atlcrypt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\atlwlan.h">
+    <ClInclude Include="..\include\atlex\atlwlan.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\atlshlwapi.h">
+    <ClInclude Include="..\include\atlex\atlshlwapi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\atlex.h">
+    <ClInclude Include="..\include\atlex\atlex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\atleap.h">
+    <ClInclude Include="..\include\atlex\atleap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\atlsec.h">
+    <ClInclude Include="..\include\atlex\atlsec.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/include/atlcrypt.h b/include/atlex/atlcrypt.h
similarity index 100%
rename from include/atlcrypt.h
rename to include/atlex/atlcrypt.h
diff --git a/include/atleap.h b/include/atlex/atleap.h
similarity index 100%
rename from include/atleap.h
rename to include/atlex/atleap.h
diff --git a/include/atlex.h b/include/atlex/atlex.h
similarity index 100%
rename from include/atlex.h
rename to include/atlex/atlex.h
diff --git a/include/atlmsi.h b/include/atlex/atlmsi.h
similarity index 100%
rename from include/atlmsi.h
rename to include/atlex/atlmsi.h
diff --git a/include/atlsec.h b/include/atlex/atlsec.h
similarity index 96%
rename from include/atlsec.h
rename to include/atlex/atlsec.h
index ea55b79..6712ff9 100644
--- a/include/atlsec.h
+++ b/include/atlex/atlsec.h
@@ -17,6 +17,8 @@
     along with Setup. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 #include <Security.h>
 
 ///
diff --git a/include/atlshlwapi.h b/include/atlex/atlshlwapi.h
similarity index 100%
rename from include/atlshlwapi.h
rename to include/atlex/atlshlwapi.h
diff --git a/include/atlwin.h b/include/atlex/atlwin.h
similarity index 100%
rename from include/atlwin.h
rename to include/atlex/atlwin.h
diff --git a/include/atlwlan.h b/include/atlex/atlwlan.h
similarity index 100%
rename from include/atlwlan.h
rename to include/atlex/atlwlan.h
diff --git a/include/stdafx.h b/src/stdafx.h
similarity index 100%
rename from include/stdafx.h
rename to src/stdafx.h