diff --git a/Builds/VisualStudio2012/beast.vcxproj b/Builds/VisualStudio2012/beast.vcxproj
index 432b76eba5..f00d6b5065 100644
--- a/Builds/VisualStudio2012/beast.vcxproj
+++ b/Builds/VisualStudio2012/beast.vcxproj
@@ -23,37 +23,37 @@
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
@@ -127,116 +127,116 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -247,49 +247,49 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -297,15 +297,15 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -322,9 +322,9 @@
-
+
-
+
@@ -507,31 +507,31 @@
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
@@ -561,13 +561,13 @@
true
true
-
+
true
true
true
true
-
+
true
true
true
@@ -589,145 +589,145 @@
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
@@ -745,211 +745,211 @@
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
@@ -967,151 +967,151 @@
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
@@ -1123,7 +1123,7 @@
true
true
-
+
true
true
true
@@ -1135,43 +1135,43 @@
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
@@ -1257,7 +1257,7 @@
true
-
+
true
true
true
diff --git a/Builds/VisualStudio2012/beast.vcxproj.filters b/Builds/VisualStudio2012/beast.vcxproj.filters
index 8645952d53..7469bab1fe 100644
--- a/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -1,24 +1,22 @@

-
-
-
+
beast_core
-
+
beast_core\native
-
+
beast_core\native
-
+
beast_core\native
-
+
beast_core\native
-
+
beast_core\native
@@ -27,9 +25,21 @@
beast_core\native\java
-
-
-
+
+ _meta
+
+
+ _meta
+
+
+ _meta
+
+
+ _meta
+
+
+ _meta
+
@@ -176,291 +186,294 @@
{f7252567-a5bb-4be2-bbd0-c9d9b62298de}
+
+ {27052a76-e315-4725-9d9a-1233c7d71aba}
+
beast_core
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\files
-
+
beast_core\files
-
+
beast_core\files
-
+
beast_core\files
-
+
beast_core\files
-
+
beast_core\files
-
+
beast_core\files
-
+
beast_core\json
-
+
beast_core\logging
-
+
beast_core\logging
-
+
beast_core\maths
-
+
beast_core\maths
-
+
beast_core\maths
-
+
beast_core\maths
-
+
beast_core\maths
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\misc
-
+
beast_core\misc
-
+
beast_core\misc
-
+
beast_core\native
-
+
beast_core\native
-
+
beast_core\native
-
+
beast_core\native
-
+
beast_core\native
-
+
beast_core\network
-
+
beast_core\network
-
+
beast_core\network
-
+
beast_core\network
-
+
beast_core\network
-
+
beast_core\streams
-
+
beast_core\streams
-
+
beast_core\streams
-
+
beast_core\streams
-
+
beast_core\streams
-
+
beast_core\streams
-
+
beast_core\streams
-
+
beast_core\streams
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\text
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\threads
-
+
beast_core\time
-
+
beast_core\time
-
+
beast_core\time
-
+
beast_core\xml
-
+
beast_core\xml
-
+
beast_core\zip
-
+
beast_core\zip
-
+
beast_core\zip
@@ -497,85 +510,85 @@
beast_core\zip\zlib
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\threads
-
+
beast_core\containers
-
+
beast_core\containers
-
+
beast_core\diagnostic
-
+
beast_core\diagnostic
-
+
beast_core\diagnostic
-
+
beast_core\diagnostic
-
+
beast_core\diagnostic
-
+
beast_core\diagnostic
-
+
beast_core\memory
-
+
beast_core\maths
-
+
beast_core\diagnostic
beast_crypto
-
+
beast_core\containers
-
+
beast_core\files
-
+
beast_core\diagnostic
-
+
beast_core\memory
beast_db
-
+
beast_db\keyvalue
@@ -647,31 +660,31 @@
beast_sqdb\detail
-
+
beast_core\maths
-
+
beast_core\text
-
+
beast_core\diagnostic
-
+
beast_core\maths
-
+
beast_core\memory
-
+
beast_core\memory
beast_core\diagnostic
-
+
beast_core\threads
-
+
beast_core\threads
@@ -695,52 +708,52 @@
beast_core\thread\impl
-
+
beast_core\thread
-
+
beast_core\thread
-
+
beast_core\thread
-
+
beast_core\thread
-
+
beast_core\thread
-
+
beast_core\thread
-
+
beast_core\thread
-
+
beast_core\thread
-
+
beast_core\maths
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+
beast_core\memory
-
+