diff --git a/windows/include/config.h b/windows/vs2010/include/config.h
similarity index 100%
rename from windows/include/config.h
rename to windows/vs2010/include/config.h
diff --git a/windows/include/getopt.h b/windows/vs2010/include/getopt.h
similarity index 100%
rename from windows/include/getopt.h
rename to windows/vs2010/include/getopt.h
diff --git a/windows/include/jansson.h b/windows/vs2010/include/jansson.h
similarity index 100%
rename from windows/include/jansson.h
rename to windows/vs2010/include/jansson.h
diff --git a/windows/include/jansson_config.h b/windows/vs2010/include/jansson_config.h
similarity index 100%
rename from windows/include/jansson_config.h
rename to windows/vs2010/include/jansson_config.h
diff --git a/windows/include/openssl/aes.h b/windows/vs2010/include/openssl/aes.h
similarity index 100%
rename from windows/include/openssl/aes.h
rename to windows/vs2010/include/openssl/aes.h
diff --git a/windows/include/openssl/asn1.h b/windows/vs2010/include/openssl/asn1.h
similarity index 100%
rename from windows/include/openssl/asn1.h
rename to windows/vs2010/include/openssl/asn1.h
diff --git a/windows/include/openssl/asn1_mac.h b/windows/vs2010/include/openssl/asn1_mac.h
similarity index 100%
rename from windows/include/openssl/asn1_mac.h
rename to windows/vs2010/include/openssl/asn1_mac.h
diff --git a/windows/include/openssl/asn1t.h b/windows/vs2010/include/openssl/asn1t.h
similarity index 100%
rename from windows/include/openssl/asn1t.h
rename to windows/vs2010/include/openssl/asn1t.h
diff --git a/windows/include/openssl/bio.h b/windows/vs2010/include/openssl/bio.h
similarity index 100%
rename from windows/include/openssl/bio.h
rename to windows/vs2010/include/openssl/bio.h
diff --git a/windows/include/openssl/blowfish.h b/windows/vs2010/include/openssl/blowfish.h
similarity index 100%
rename from windows/include/openssl/blowfish.h
rename to windows/vs2010/include/openssl/blowfish.h
diff --git a/windows/include/openssl/bn.h b/windows/vs2010/include/openssl/bn.h
similarity index 100%
rename from windows/include/openssl/bn.h
rename to windows/vs2010/include/openssl/bn.h
diff --git a/windows/include/openssl/buffer.h b/windows/vs2010/include/openssl/buffer.h
similarity index 100%
rename from windows/include/openssl/buffer.h
rename to windows/vs2010/include/openssl/buffer.h
diff --git a/windows/include/openssl/camellia.h b/windows/vs2010/include/openssl/camellia.h
similarity index 100%
rename from windows/include/openssl/camellia.h
rename to windows/vs2010/include/openssl/camellia.h
diff --git a/windows/include/openssl/cast.h b/windows/vs2010/include/openssl/cast.h
similarity index 100%
rename from windows/include/openssl/cast.h
rename to windows/vs2010/include/openssl/cast.h
diff --git a/windows/include/openssl/cmac.h b/windows/vs2010/include/openssl/cmac.h
similarity index 100%
rename from windows/include/openssl/cmac.h
rename to windows/vs2010/include/openssl/cmac.h
diff --git a/windows/include/openssl/cms.h b/windows/vs2010/include/openssl/cms.h
similarity index 100%
rename from windows/include/openssl/cms.h
rename to windows/vs2010/include/openssl/cms.h
diff --git a/windows/include/openssl/comp.h b/windows/vs2010/include/openssl/comp.h
similarity index 100%
rename from windows/include/openssl/comp.h
rename to windows/vs2010/include/openssl/comp.h
diff --git a/windows/include/openssl/conf.h b/windows/vs2010/include/openssl/conf.h
similarity index 100%
rename from windows/include/openssl/conf.h
rename to windows/vs2010/include/openssl/conf.h
diff --git a/windows/include/openssl/conf_api.h b/windows/vs2010/include/openssl/conf_api.h
similarity index 100%
rename from windows/include/openssl/conf_api.h
rename to windows/vs2010/include/openssl/conf_api.h
diff --git a/windows/include/openssl/crypto.h b/windows/vs2010/include/openssl/crypto.h
similarity index 100%
rename from windows/include/openssl/crypto.h
rename to windows/vs2010/include/openssl/crypto.h
diff --git a/windows/include/openssl/des.h b/windows/vs2010/include/openssl/des.h
similarity index 100%
rename from windows/include/openssl/des.h
rename to windows/vs2010/include/openssl/des.h
diff --git a/windows/include/openssl/des_old.h b/windows/vs2010/include/openssl/des_old.h
similarity index 100%
rename from windows/include/openssl/des_old.h
rename to windows/vs2010/include/openssl/des_old.h
diff --git a/windows/include/openssl/dh.h b/windows/vs2010/include/openssl/dh.h
similarity index 100%
rename from windows/include/openssl/dh.h
rename to windows/vs2010/include/openssl/dh.h
diff --git a/windows/include/openssl/dsa.h b/windows/vs2010/include/openssl/dsa.h
similarity index 100%
rename from windows/include/openssl/dsa.h
rename to windows/vs2010/include/openssl/dsa.h
diff --git a/windows/include/openssl/dso.h b/windows/vs2010/include/openssl/dso.h
similarity index 100%
rename from windows/include/openssl/dso.h
rename to windows/vs2010/include/openssl/dso.h
diff --git a/windows/include/openssl/dtls1.h b/windows/vs2010/include/openssl/dtls1.h
similarity index 100%
rename from windows/include/openssl/dtls1.h
rename to windows/vs2010/include/openssl/dtls1.h
diff --git a/windows/include/openssl/e_os2.h b/windows/vs2010/include/openssl/e_os2.h
similarity index 100%
rename from windows/include/openssl/e_os2.h
rename to windows/vs2010/include/openssl/e_os2.h
diff --git a/windows/include/openssl/ebcdic.h b/windows/vs2010/include/openssl/ebcdic.h
similarity index 100%
rename from windows/include/openssl/ebcdic.h
rename to windows/vs2010/include/openssl/ebcdic.h
diff --git a/windows/include/openssl/ec.h b/windows/vs2010/include/openssl/ec.h
similarity index 100%
rename from windows/include/openssl/ec.h
rename to windows/vs2010/include/openssl/ec.h
diff --git a/windows/include/openssl/ecdh.h b/windows/vs2010/include/openssl/ecdh.h
similarity index 100%
rename from windows/include/openssl/ecdh.h
rename to windows/vs2010/include/openssl/ecdh.h
diff --git a/windows/include/openssl/ecdsa.h b/windows/vs2010/include/openssl/ecdsa.h
similarity index 100%
rename from windows/include/openssl/ecdsa.h
rename to windows/vs2010/include/openssl/ecdsa.h
diff --git a/windows/include/openssl/engine.h b/windows/vs2010/include/openssl/engine.h
similarity index 100%
rename from windows/include/openssl/engine.h
rename to windows/vs2010/include/openssl/engine.h
diff --git a/windows/include/openssl/err.h b/windows/vs2010/include/openssl/err.h
similarity index 100%
rename from windows/include/openssl/err.h
rename to windows/vs2010/include/openssl/err.h
diff --git a/windows/include/openssl/evp.h b/windows/vs2010/include/openssl/evp.h
similarity index 100%
rename from windows/include/openssl/evp.h
rename to windows/vs2010/include/openssl/evp.h
diff --git a/windows/include/openssl/hmac.h b/windows/vs2010/include/openssl/hmac.h
similarity index 100%
rename from windows/include/openssl/hmac.h
rename to windows/vs2010/include/openssl/hmac.h
diff --git a/windows/include/openssl/idea.h b/windows/vs2010/include/openssl/idea.h
similarity index 100%
rename from windows/include/openssl/idea.h
rename to windows/vs2010/include/openssl/idea.h
diff --git a/windows/include/openssl/krb5_asn.h b/windows/vs2010/include/openssl/krb5_asn.h
similarity index 100%
rename from windows/include/openssl/krb5_asn.h
rename to windows/vs2010/include/openssl/krb5_asn.h
diff --git a/windows/include/openssl/kssl.h b/windows/vs2010/include/openssl/kssl.h
similarity index 100%
rename from windows/include/openssl/kssl.h
rename to windows/vs2010/include/openssl/kssl.h
diff --git a/windows/include/openssl/lhash.h b/windows/vs2010/include/openssl/lhash.h
similarity index 100%
rename from windows/include/openssl/lhash.h
rename to windows/vs2010/include/openssl/lhash.h
diff --git a/windows/include/openssl/md4.h b/windows/vs2010/include/openssl/md4.h
similarity index 100%
rename from windows/include/openssl/md4.h
rename to windows/vs2010/include/openssl/md4.h
diff --git a/windows/include/openssl/md5.h b/windows/vs2010/include/openssl/md5.h
similarity index 100%
rename from windows/include/openssl/md5.h
rename to windows/vs2010/include/openssl/md5.h
diff --git a/windows/include/openssl/mdc2.h b/windows/vs2010/include/openssl/mdc2.h
similarity index 100%
rename from windows/include/openssl/mdc2.h
rename to windows/vs2010/include/openssl/mdc2.h
diff --git a/windows/include/openssl/modes.h b/windows/vs2010/include/openssl/modes.h
similarity index 100%
rename from windows/include/openssl/modes.h
rename to windows/vs2010/include/openssl/modes.h
diff --git a/windows/include/openssl/obj_mac.h b/windows/vs2010/include/openssl/obj_mac.h
similarity index 100%
rename from windows/include/openssl/obj_mac.h
rename to windows/vs2010/include/openssl/obj_mac.h
diff --git a/windows/include/openssl/objects.h b/windows/vs2010/include/openssl/objects.h
similarity index 100%
rename from windows/include/openssl/objects.h
rename to windows/vs2010/include/openssl/objects.h
diff --git a/windows/include/openssl/ocsp.h b/windows/vs2010/include/openssl/ocsp.h
similarity index 100%
rename from windows/include/openssl/ocsp.h
rename to windows/vs2010/include/openssl/ocsp.h
diff --git a/windows/include/openssl/opensslconf.h b/windows/vs2010/include/openssl/opensslconf.h
similarity index 100%
rename from windows/include/openssl/opensslconf.h
rename to windows/vs2010/include/openssl/opensslconf.h
diff --git a/windows/include/openssl/opensslv.h b/windows/vs2010/include/openssl/opensslv.h
similarity index 100%
rename from windows/include/openssl/opensslv.h
rename to windows/vs2010/include/openssl/opensslv.h
diff --git a/windows/include/openssl/ossl_typ.h b/windows/vs2010/include/openssl/ossl_typ.h
similarity index 100%
rename from windows/include/openssl/ossl_typ.h
rename to windows/vs2010/include/openssl/ossl_typ.h
diff --git a/windows/include/openssl/pem.h b/windows/vs2010/include/openssl/pem.h
similarity index 100%
rename from windows/include/openssl/pem.h
rename to windows/vs2010/include/openssl/pem.h
diff --git a/windows/include/openssl/pem2.h b/windows/vs2010/include/openssl/pem2.h
similarity index 100%
rename from windows/include/openssl/pem2.h
rename to windows/vs2010/include/openssl/pem2.h
diff --git a/windows/include/openssl/pkcs12.h b/windows/vs2010/include/openssl/pkcs12.h
similarity index 100%
rename from windows/include/openssl/pkcs12.h
rename to windows/vs2010/include/openssl/pkcs12.h
diff --git a/windows/include/openssl/pkcs7.h b/windows/vs2010/include/openssl/pkcs7.h
similarity index 100%
rename from windows/include/openssl/pkcs7.h
rename to windows/vs2010/include/openssl/pkcs7.h
diff --git a/windows/include/openssl/pqueue.h b/windows/vs2010/include/openssl/pqueue.h
similarity index 100%
rename from windows/include/openssl/pqueue.h
rename to windows/vs2010/include/openssl/pqueue.h
diff --git a/windows/include/openssl/rand.h b/windows/vs2010/include/openssl/rand.h
similarity index 100%
rename from windows/include/openssl/rand.h
rename to windows/vs2010/include/openssl/rand.h
diff --git a/windows/include/openssl/rc2.h b/windows/vs2010/include/openssl/rc2.h
similarity index 100%
rename from windows/include/openssl/rc2.h
rename to windows/vs2010/include/openssl/rc2.h
diff --git a/windows/include/openssl/rc4.h b/windows/vs2010/include/openssl/rc4.h
similarity index 100%
rename from windows/include/openssl/rc4.h
rename to windows/vs2010/include/openssl/rc4.h
diff --git a/windows/include/openssl/ripemd.h b/windows/vs2010/include/openssl/ripemd.h
similarity index 100%
rename from windows/include/openssl/ripemd.h
rename to windows/vs2010/include/openssl/ripemd.h
diff --git a/windows/include/openssl/rsa.h b/windows/vs2010/include/openssl/rsa.h
similarity index 100%
rename from windows/include/openssl/rsa.h
rename to windows/vs2010/include/openssl/rsa.h
diff --git a/windows/include/openssl/safestack.h b/windows/vs2010/include/openssl/safestack.h
similarity index 100%
rename from windows/include/openssl/safestack.h
rename to windows/vs2010/include/openssl/safestack.h
diff --git a/windows/include/openssl/seed.h b/windows/vs2010/include/openssl/seed.h
similarity index 100%
rename from windows/include/openssl/seed.h
rename to windows/vs2010/include/openssl/seed.h
diff --git a/windows/include/openssl/sha.h b/windows/vs2010/include/openssl/sha.h
similarity index 100%
rename from windows/include/openssl/sha.h
rename to windows/vs2010/include/openssl/sha.h
diff --git a/windows/include/openssl/srp.h b/windows/vs2010/include/openssl/srp.h
similarity index 100%
rename from windows/include/openssl/srp.h
rename to windows/vs2010/include/openssl/srp.h
diff --git a/windows/include/openssl/srtp.h b/windows/vs2010/include/openssl/srtp.h
similarity index 100%
rename from windows/include/openssl/srtp.h
rename to windows/vs2010/include/openssl/srtp.h
diff --git a/windows/include/openssl/ssl.h b/windows/vs2010/include/openssl/ssl.h
similarity index 100%
rename from windows/include/openssl/ssl.h
rename to windows/vs2010/include/openssl/ssl.h
diff --git a/windows/include/openssl/ssl2.h b/windows/vs2010/include/openssl/ssl2.h
similarity index 100%
rename from windows/include/openssl/ssl2.h
rename to windows/vs2010/include/openssl/ssl2.h
diff --git a/windows/include/openssl/ssl23.h b/windows/vs2010/include/openssl/ssl23.h
similarity index 100%
rename from windows/include/openssl/ssl23.h
rename to windows/vs2010/include/openssl/ssl23.h
diff --git a/windows/include/openssl/ssl3.h b/windows/vs2010/include/openssl/ssl3.h
similarity index 100%
rename from windows/include/openssl/ssl3.h
rename to windows/vs2010/include/openssl/ssl3.h
diff --git a/windows/include/openssl/stack.h b/windows/vs2010/include/openssl/stack.h
similarity index 100%
rename from windows/include/openssl/stack.h
rename to windows/vs2010/include/openssl/stack.h
diff --git a/windows/include/openssl/symhacks.h b/windows/vs2010/include/openssl/symhacks.h
similarity index 100%
rename from windows/include/openssl/symhacks.h
rename to windows/vs2010/include/openssl/symhacks.h
diff --git a/windows/include/openssl/tls1.h b/windows/vs2010/include/openssl/tls1.h
similarity index 100%
rename from windows/include/openssl/tls1.h
rename to windows/vs2010/include/openssl/tls1.h
diff --git a/windows/include/openssl/ts.h b/windows/vs2010/include/openssl/ts.h
similarity index 100%
rename from windows/include/openssl/ts.h
rename to windows/vs2010/include/openssl/ts.h
diff --git a/windows/include/openssl/txt_db.h b/windows/vs2010/include/openssl/txt_db.h
similarity index 100%
rename from windows/include/openssl/txt_db.h
rename to windows/vs2010/include/openssl/txt_db.h
diff --git a/windows/include/openssl/ui.h b/windows/vs2010/include/openssl/ui.h
similarity index 100%
rename from windows/include/openssl/ui.h
rename to windows/vs2010/include/openssl/ui.h
diff --git a/windows/include/openssl/ui_compat.h b/windows/vs2010/include/openssl/ui_compat.h
similarity index 100%
rename from windows/include/openssl/ui_compat.h
rename to windows/vs2010/include/openssl/ui_compat.h
diff --git a/windows/include/openssl/whrlpool.h b/windows/vs2010/include/openssl/whrlpool.h
similarity index 100%
rename from windows/include/openssl/whrlpool.h
rename to windows/vs2010/include/openssl/whrlpool.h
diff --git a/windows/include/openssl/x509.h b/windows/vs2010/include/openssl/x509.h
similarity index 100%
rename from windows/include/openssl/x509.h
rename to windows/vs2010/include/openssl/x509.h
diff --git a/windows/include/openssl/x509_vfy.h b/windows/vs2010/include/openssl/x509_vfy.h
similarity index 100%
rename from windows/include/openssl/x509_vfy.h
rename to windows/vs2010/include/openssl/x509_vfy.h
diff --git a/windows/include/openssl/x509v3.h b/windows/vs2010/include/openssl/x509v3.h
similarity index 100%
rename from windows/include/openssl/x509v3.h
rename to windows/vs2010/include/openssl/x509v3.h
diff --git a/windows/include/regex.h b/windows/vs2010/include/regex.h
similarity index 100%
rename from windows/include/regex.h
rename to windows/vs2010/include/regex.h
diff --git a/windows/lib/jansson32.lib b/windows/vs2010/lib/jansson32.lib
similarity index 100%
rename from windows/lib/jansson32.lib
rename to windows/vs2010/lib/jansson32.lib
diff --git a/windows/lib/jansson64.lib b/windows/vs2010/lib/jansson64.lib
similarity index 100%
rename from windows/lib/jansson64.lib
rename to windows/vs2010/lib/jansson64.lib
diff --git a/windows/lib/libeay32.lib b/windows/vs2010/lib/libeay32.lib
similarity index 100%
rename from windows/lib/libeay32.lib
rename to windows/vs2010/lib/libeay32.lib
diff --git a/windows/lib/libeay64.lib b/windows/vs2010/lib/libeay64.lib
similarity index 100%
rename from windows/lib/libeay64.lib
rename to windows/vs2010/lib/libeay64.lib
diff --git a/windows/libyara/libyara.vcxproj b/windows/vs2010/libyara/libyara.vcxproj
similarity index 76%
rename from windows/libyara/libyara.vcxproj
rename to windows/vs2010/libyara/libyara.vcxproj
index 5fea317b..933eef25 100644
--- a/windows/libyara/libyara.vcxproj
+++ b/windows/vs2010/libyara/libyara.vcxproj
@@ -74,7 +74,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;CUCKOO;HASH;HAVE_LIBCRYPTO</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\libyara;..\..\libyara\include;..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DisableSpecificWarnings>4005;4273;4090;</DisableSpecificWarnings>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -98,7 +98,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PreprocessorDefinitions>CUCKOO;HASH;HAVE_LIBCRYPTO</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\libyara;..\..\libyara\include;..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4005;4273;4090;</DisableSpecificWarnings>
       <CompileAs>CompileAsCpp</CompileAs>
       <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName>
@@ -120,7 +120,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;CUCKOO;HASH;HAVE_LIBCRYPTO</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\libyara;..\..\libyara\include;..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <DisableSpecificWarnings>4005;4273;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -140,7 +140,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PreprocessorDefinitions>CUCKOO;HASH;HAVE_LIBCRYPTO</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..;..\..\libyara;..\..\libyara\include;..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\libyara;..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4005;4273;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <CompileAs>CompileAsCpp</CompileAs>
       <ObjectFileName>$(IntDir)/%(RelativeDir)</ObjectFileName>
@@ -158,41 +158,40 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\libyara\ahocorasick.c" />
-    <ClCompile Include="..\..\libyara\arena.c" />
-    <ClCompile Include="..\..\libyara\atoms.c" />
-    <ClCompile Include="..\..\libyara\compiler.c" />
-    <ClCompile Include="..\..\libyara\exec.c" />
-    <ClCompile Include="..\..\libyara\exefiles.c" />
-    <ClCompile Include="..\..\libyara\filemap.c" />
-    <ClCompile Include="..\..\libyara\grammar.c" />
-    <ClCompile Include="..\..\libyara\hash.c" />
-    <ClCompile Include="..\..\libyara\hex_grammar.c" />
-    <ClCompile Include="..\..\libyara\hex_lexer.c" />
-    <ClCompile Include="..\..\libyara\lexer.c" />
-    <ClCompile Include="..\..\libyara\libyara.c" />
-    <ClCompile Include="..\..\libyara\mem.c" />
-    <ClCompile Include="..\..\libyara\modules.c" />
-    <ClCompile Include="..\..\libyara\modules\cuckoo.c" />
-    <ClCompile Include="..\..\libyara\modules\elf.c" />
-    <ClCompile Include="..\..\libyara\modules\hash.c" />
-    <ClCompile Include="..\..\libyara\modules\math.c" />
-    <ClCompile Include="..\..\libyara\modules\pe.c" />
-    <ClCompile Include="..\..\libyara\modules\tests.c" />
-    <ClCompile Include="..\..\libyara\object.c" />
-    <ClCompile Include="..\..\libyara\parser.c" />
-    <ClCompile Include="..\..\libyara\proc.c" />
-    <ClCompile Include="..\..\libyara\re.c" />
-    <ClCompile Include="..\..\libyara\re_grammar.c" />
-    <ClCompile Include="..\..\libyara\re_lexer.c" />
-    <ClCompile Include="..\..\libyara\rules.c" />
-    <ClCompile Include="..\..\libyara\scan.c" />
-    <ClCompile Include="..\..\libyara\sizedstr.c" />
-    <ClCompile Include="..\..\libyara\stream.c" />
-    <ClCompile Include="..\..\libyara\strutils.c" />
-    <ClCompile Include="..\..\libyara\threading.c" />
+    <ClCompile Include="..\..\..\libyara\ahocorasick.c" />
+    <ClCompile Include="..\..\..\libyara\arena.c" />
+    <ClCompile Include="..\..\..\libyara\atoms.c" />
+    <ClCompile Include="..\..\..\libyara\compiler.c" />
+    <ClCompile Include="..\..\..\libyara\exec.c" />
+    <ClCompile Include="..\..\..\libyara\exefiles.c" />
+    <ClCompile Include="..\..\..\libyara\filemap.c" />
+    <ClCompile Include="..\..\..\libyara\grammar.c" />
+    <ClCompile Include="..\..\..\libyara\hash.c" />
+    <ClCompile Include="..\..\..\libyara\hex_grammar.c" />
+    <ClCompile Include="..\..\..\libyara\hex_lexer.c" />
+    <ClCompile Include="..\..\..\libyara\lexer.c" />
+    <ClCompile Include="..\..\..\libyara\libyara.c" />
+    <ClCompile Include="..\..\..\libyara\mem.c" />
+    <ClCompile Include="..\..\..\libyara\modules.c" />
+    <ClCompile Include="..\..\..\libyara\modules\cuckoo.c" />
+    <ClCompile Include="..\..\..\libyara\modules\elf.c" />
+    <ClCompile Include="..\..\..\libyara\modules\hash.c" />
+    <ClCompile Include="..\..\..\libyara\modules\math.c" />
+    <ClCompile Include="..\..\..\libyara\modules\pe.c" />
+    <ClCompile Include="..\..\..\libyara\modules\tests.c" />
+    <ClCompile Include="..\..\..\libyara\object.c" />
+    <ClCompile Include="..\..\..\libyara\parser.c" />
+    <ClCompile Include="..\..\..\libyara\proc.c" />
+    <ClCompile Include="..\..\..\libyara\re.c" />
+    <ClCompile Include="..\..\..\libyara\re_grammar.c" />
+    <ClCompile Include="..\..\..\libyara\re_lexer.c" />
+    <ClCompile Include="..\..\..\libyara\rules.c" />
+    <ClCompile Include="..\..\..\libyara\scan.c" />
+    <ClCompile Include="..\..\..\libyara\sizedstr.c" />
+    <ClCompile Include="..\..\..\libyara\stream.c" />
+    <ClCompile Include="..\..\..\libyara\strutils.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/windows/yara/yara.sln b/windows/vs2010/yara.sln
similarity index 87%
rename from windows/yara/yara.sln
rename to windows/vs2010/yara.sln
index 7a2a3e2c..cb0c3448 100644
--- a/windows/yara/yara.sln
+++ b/windows/vs2010/yara.sln
@@ -1,14 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyara", "..\libyara\libyara.vcxproj", "{6A0FF993-CEDB-5133-B51F-E15D389664EF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyara", ".\libyara\libyara.vcxproj", "{6A0FF993-CEDB-5133-B51F-E15D389664EF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yara", "yara.vcxproj", "{E203D7BB-29B9-4152-9208-BB410983CE8C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yara", ".\yara\yara.vcxproj", "{E203D7BB-29B9-4152-9208-BB410983CE8C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6A0FF993-CEDB-5133-B51F-E15D389664EF} = {6A0FF993-CEDB-5133-B51F-E15D389664EF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yarac", "..\yarac\yarac.vcxproj", "{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yarac", ".\yarac\yarac.vcxproj", "{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6A0FF993-CEDB-5133-B51F-E15D389664EF} = {6A0FF993-CEDB-5133-B51F-E15D389664EF}
 	EndProjectSection
diff --git a/windows/yara/getopt.c b/windows/vs2010/yara/getopt.c
similarity index 100%
rename from windows/yara/getopt.c
rename to windows/vs2010/yara/getopt.c
diff --git a/windows/yara/yara.vcxproj b/windows/vs2010/yara/yara.vcxproj
similarity index 91%
rename from windows/yara/yara.vcxproj
rename to windows/vs2010/yara/yara.vcxproj
index b1097f52..4b2e371c 100644
--- a/windows/yara/yara.vcxproj
+++ b/windows/vs2010/yara/yara.vcxproj
@@ -19,9 +19,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\args.c" />
-    <ClCompile Include="..\..\threading.c" />
-    <ClCompile Include="..\..\yara.c" />
+    <ClCompile Include="..\..\..\args.c" />
+    <ClCompile Include="..\..\..\threading.c" />
+    <ClCompile Include="..\..\..\yara.c" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E203D7BB-29B9-4152-9208-BB410983CE8C}</ProjectGuid>
@@ -94,7 +94,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\libyara\include;..\include;..\..\argparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..\argparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -113,7 +113,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\libyara\include;..\include;..\..\argparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
@@ -132,7 +132,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\libyara\include;..\include;..\..\argparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -157,7 +157,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\libyara\include;..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
@@ -175,4 +175,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/windows/yarac/getopt.c b/windows/vs2010/yarac/getopt.c
similarity index 100%
rename from windows/yarac/getopt.c
rename to windows/vs2010/yarac/getopt.c
diff --git a/windows/yarac/yarac.vcxproj b/windows/vs2010/yarac/yarac.vcxproj
similarity index 91%
rename from windows/yarac/yarac.vcxproj
rename to windows/vs2010/yarac/yarac.vcxproj
index 316f37be..f5d581b9 100644
--- a/windows/yarac/yarac.vcxproj
+++ b/windows/vs2010/yarac/yarac.vcxproj
@@ -73,7 +73,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\libyara\include;..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
@@ -92,7 +92,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\libyara\include;..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\libyara\include;..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -117,7 +117,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\libyara\include;..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libyara\include;..\include;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -127,10 +127,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\args.c" />
-    <ClCompile Include="..\..\yarac.c" />
+    <ClCompile Include="..\..\..\args.c" />
+    <ClCompile Include="..\..\..\yarac.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/windows/vs2015/yara-2015.sln b/windows/vs2015/yara.sln
similarity index 100%
rename from windows/vs2015/yara-2015.sln
rename to windows/vs2015/yara.sln