diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87cf561..949e29f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,14 +18,14 @@ add_executable(${PROJECT_NAME})
 
 # Add key executable block
 target_sources(${PROJECT_NAME} PUBLIC
-    ${CMAKE_CURRENT_LIST_DIR}/dev/VisualStudio/main.c
+    ${CMAKE_CURRENT_LIST_DIR}/dev/main.c
     ${CMAKE_CURRENT_LIST_DIR}/tests/lwmem_test.c
     )
 
 # Add key include paths
 target_include_directories(${PROJECT_NAME} PUBLIC
     ${CMAKE_CURRENT_LIST_DIR}
-    ${CMAKE_CURRENT_LIST_DIR}/dev/VisualStudio
+    ${CMAKE_CURRENT_LIST_DIR}/dev
     )
 
 # Compilation definition information
diff --git a/dev/VisualStudio/lwmem_dev.sln b/dev/lwmem_dev.sln
similarity index 100%
rename from dev/VisualStudio/lwmem_dev.sln
rename to dev/lwmem_dev.sln
diff --git a/dev/VisualStudio/lwmem_dev.vcxproj b/dev/lwmem_dev.vcxproj
similarity index 96%
rename from dev/VisualStudio/lwmem_dev.vcxproj
rename to dev/lwmem_dev.vcxproj
index 694d66a..3567e76 100644
--- a/dev/VisualStudio/lwmem_dev.vcxproj
+++ b/dev/lwmem_dev.vcxproj
@@ -73,7 +73,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\lwmem\src\include;.;$(IncludePath)</IncludePath>
+    <IncludePath>..\lwmem\src\include;.;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -143,9 +143,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\lwmem\src\lwmem\lwmem.c" />
-    <ClCompile Include="..\..\lwmem\src\system\lwmem_sys_win32.c" />
-    <ClCompile Include="..\..\tests\lwmem_test.c" />
+    <ClCompile Include="..\lwmem\src\lwmem\lwmem.c" />
+    <ClCompile Include="..\lwmem\src\system\lwmem_sys_win32.c" />
+    <ClCompile Include="..\tests\lwmem_test.c" />
     <ClCompile Include="main.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/dev/VisualStudio/lwmem_dev.vcxproj.filters b/dev/lwmem_dev.vcxproj.filters
similarity index 84%
rename from dev/VisualStudio/lwmem_dev.vcxproj.filters
rename to dev/lwmem_dev.vcxproj.filters
index 46dbc3b..feefc4e 100644
--- a/dev/VisualStudio/lwmem_dev.vcxproj.filters
+++ b/dev/lwmem_dev.vcxproj.filters
@@ -16,13 +16,13 @@
     <ClCompile Include="main.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\lwmem\src\lwmem\lwmem.c">
+    <ClCompile Include="..\lwmem\src\lwmem\lwmem.c">
       <Filter>Source Files\LWMEM</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\lwmem\src\system\lwmem_sys_win32.c">
+    <ClCompile Include="..\lwmem\src\system\lwmem_sys_win32.c">
       <Filter>Source Files\LWMEM</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\tests\lwmem_test.c">
+    <ClCompile Include="..\tests\lwmem_test.c">
       <Filter>Source Files\Tests</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/dev/VisualStudio/lwmem_opts.h b/dev/lwmem_opts.h
similarity index 100%
rename from dev/VisualStudio/lwmem_opts.h
rename to dev/lwmem_opts.h
diff --git a/dev/VisualStudio/main.c b/dev/main.c
similarity index 100%
rename from dev/VisualStudio/main.c
rename to dev/main.c