diff --git a/Makefile b/Makefile
index 4d17d69..bab56c8 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ endif
 
 INCLUDE	= -I./
 INCLUDE	+= -I./support/minimig
-INCLUDE	+= -I./3pp/libco
+INCLUDE	+= -I./lib/libco
 
 PRJ = MiSTer
 SRC = $(wildcard *.c)
@@ -27,7 +27,7 @@ ARCHIE_SRC	= $(wildcard ./support/archie/*.cpp)
 ST_SRC	= $(wildcard ./support/st/*.cpp)
 X86_SRC	= $(wildcard ./support/x86/*.cpp)
 SNES_SRC	= $(wildcard ./support/snes/*.cpp)
-LIBCO_SRC	= 3pp/libco/arm.c
+LIBCO_SRC	= lib/libco/arm.c
 
 VPATH	= ./:./support/minimig:./support/sharpmz:./support/archie:./support/st:./support/x86:./support/snes
 
diff --git a/MiSTer.vcxproj b/MiSTer.vcxproj
index 941417f..3d24be6 100644
--- a/MiSTer.vcxproj
+++ b/MiSTer.vcxproj
@@ -53,6 +53,8 @@
     <ClCompile Include="hardware.cpp" />
     <ClCompile Include="ini_parser.cpp" />
     <ClCompile Include="input.cpp" />
+    <ClCompile Include="lib\libco\arm.c" />
+    <ClCompile Include="lib\libco\libco.c" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="menu.cpp" />
     <ClCompile Include="osd.cpp" />
@@ -88,6 +90,8 @@
     <ClInclude Include="hardware.h" />
     <ClInclude Include="ini_parser.h" />
     <ClInclude Include="input.h" />
+    <ClInclude Include="lib\libco\libco.h" />
+    <ClInclude Include="lib\libco\settings.h" />
     <ClInclude Include="logo.h" />
     <ClInclude Include="menu.h" />
     <ClInclude Include="osd.h" />
diff --git a/MiSTer.vcxproj.filters b/MiSTer.vcxproj.filters
index 3b13493..adfc3ec 100644
--- a/MiSTer.vcxproj.filters
+++ b/MiSTer.vcxproj.filters
@@ -9,6 +9,12 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
+    <Filter Include="Header Files\lib">
+      <UniqueIdentifier>{0c4bf53d-7986-4434-bbd2-734da3553be9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\lib">
+      <UniqueIdentifier>{da657dc9-d7b4-417e-b916-6543cf17b67e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="build.sh" />
@@ -94,6 +100,12 @@
     <ClCompile Include="support\snes\snes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="lib\libco\arm.c">
+      <Filter>Source Files\lib</Filter>
+    </ClCompile>
+    <ClCompile Include="lib\libco\libco.c">
+      <Filter>Source Files\lib</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="battery.h">
@@ -201,5 +213,11 @@
     <ClInclude Include="support\snes\snes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="lib\libco\libco.h">
+      <Filter>Header Files\lib</Filter>
+    </ClInclude>
+    <ClInclude Include="lib\libco\settings.h">
+      <Filter>Header Files\lib</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/3pp/libco/amd64.c b/lib/libco/amd64.c
similarity index 100%
rename from 3pp/libco/amd64.c
rename to lib/libco/amd64.c
diff --git a/3pp/libco/arm.c b/lib/libco/arm.c
similarity index 100%
rename from 3pp/libco/arm.c
rename to lib/libco/arm.c
diff --git a/3pp/libco/doc/style.css b/lib/libco/doc/style.css
similarity index 100%
rename from 3pp/libco/doc/style.css
rename to lib/libco/doc/style.css
diff --git a/3pp/libco/doc/targets.html b/lib/libco/doc/targets.html
similarity index 100%
rename from 3pp/libco/doc/targets.html
rename to lib/libco/doc/targets.html
diff --git a/3pp/libco/doc/usage.html b/lib/libco/doc/usage.html
similarity index 100%
rename from 3pp/libco/doc/usage.html
rename to lib/libco/doc/usage.html
diff --git a/3pp/libco/fiber.c b/lib/libco/fiber.c
similarity index 100%
rename from 3pp/libco/fiber.c
rename to lib/libco/fiber.c
diff --git a/3pp/libco/libco.c b/lib/libco/libco.c
similarity index 100%
rename from 3pp/libco/libco.c
rename to lib/libco/libco.c
diff --git a/3pp/libco/libco.h b/lib/libco/libco.h
similarity index 100%
rename from 3pp/libco/libco.h
rename to lib/libco/libco.h
diff --git a/3pp/libco/ppc.c b/lib/libco/ppc.c
similarity index 100%
rename from 3pp/libco/ppc.c
rename to lib/libco/ppc.c
diff --git a/3pp/libco/settings.h b/lib/libco/settings.h
similarity index 100%
rename from 3pp/libco/settings.h
rename to lib/libco/settings.h
diff --git a/3pp/libco/sjlj.c b/lib/libco/sjlj.c
similarity index 100%
rename from 3pp/libco/sjlj.c
rename to lib/libco/sjlj.c
diff --git a/3pp/libco/ucontext.c b/lib/libco/ucontext.c
similarity index 100%
rename from 3pp/libco/ucontext.c
rename to lib/libco/ucontext.c
diff --git a/3pp/libco/x86.c b/lib/libco/x86.c
similarity index 100%
rename from 3pp/libco/x86.c
rename to lib/libco/x86.c