diff --git a/test/vs2013/etl.vcxproj b/test/vs2013/etl.vcxproj
index 7a9a7907..69478329 100644
--- a/test/vs2013/etl.vcxproj
+++ b/test/vs2013/etl.vcxproj
@@ -112,11 +112,29 @@
     <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.h" />
     <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\XmlTestReporter.h" />
     <ClInclude Include="..\..\array.h" />
+    <ClInclude Include="..\..\cyclic_value.h" />
+    <ClInclude Include="..\..\doxygen.h" />
     <ClInclude Include="..\..\enum_type.h" />
     <ClInclude Include="..\..\exception.h" />
     <ClInclude Include="..\..\function.h" />
-    <ClInclude Include="..\..\math.h" />
+    <ClInclude Include="..\..\iqueue.h" />
+    <ClInclude Include="..\..\istack.h" />
+    <ClInclude Include="..\..\container.h" />
+    <ClInclude Include="..\..\ivector.h" />
+    <ClInclude Include="..\..\largest.h" />
+    <ClInclude Include="..\..\maths.h" />
+    <ClInclude Include="..\..\nullptr.h" />
+    <ClInclude Include="..\..\numeric.h" />
+    <ClInclude Include="..\..\observer.h" />
     <ClInclude Include="..\..\queue.h" />
+    <ClInclude Include="..\..\queue_base.h" />
+    <ClInclude Include="..\..\stack.h" />
+    <ClInclude Include="..\..\stack_base.h" />
+    <ClInclude Include="..\..\static_assert.h" />
+    <ClInclude Include="..\..\type_traits.h" />
+    <ClInclude Include="..\..\vector.h" />
+    <ClInclude Include="..\..\vector_base.h" />
+    <ClInclude Include="..\..\visitor.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\AssertException.cpp" />
@@ -142,6 +160,23 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
       </AdditionalIncludeDirectories>
     </ClCompile>
+    <ClCompile Include="..\test_container.cpp" />
+    <ClCompile Include="..\test_cyclic_value.cpp" />
+    <ClCompile Include="..\test_enum_type.cpp" />
+    <ClCompile Include="..\test_exception.cpp" />
+    <ClCompile Include="..\test_function.cpp" />
+    <ClCompile Include="..\test_largest.cpp" />
+    <ClCompile Include="..\test_math.cpp" />
+    <ClCompile Include="..\test_numeric.cpp" />
+    <ClCompile Include="..\test_observer.cpp" />
+    <ClCompile Include="..\test_queue.cpp" />
+    <ClCompile Include="..\test_stack.cpp" />
+    <ClCompile Include="..\test_type_traits.cpp" />
+    <ClCompile Include="..\test_vector.cpp" />
+    <ClCompile Include="..\test_visitor.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Doxyfile" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/test/vs2013/etl.vcxproj.filters b/test/vs2013/etl.vcxproj.filters
index da206089..846ac323 100644
--- a/test/vs2013/etl.vcxproj.filters
+++ b/test/vs2013/etl.vcxproj.filters
@@ -22,26 +22,20 @@
     <Filter Include="UnitTest++\Win32">
       <UniqueIdentifier>{107d7e33-580f-4dc5-be11-a4b2076c2c10}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ETL\Containers">
+      <UniqueIdentifier>{dc39d09c-75c9-453f-8feb-9631a200c0f4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ETL\Utilities">
+      <UniqueIdentifier>{ab41d19f-82fe-4974-a73b-16aebfa1d03f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ETL\Patterns">
+      <UniqueIdentifier>{d56ca96b-66e1-46cb-83fd-1cd72c51d962}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ETL\Maths">
+      <UniqueIdentifier>{1c55dd7d-c04b-428c-810b-dd3a08fc4c65}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\array.h">
-      <Filter>ETL</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\enum_type.h">
-      <Filter>ETL</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\exception.h">
-      <Filter>ETL</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\function.h">
-      <Filter>ETL</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\math.h">
-      <Filter>ETL</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\queue.h">
-      <Filter>ETL</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\AssertException.h">
       <Filter>UnitTest++</Filter>
     </ClInclude>
@@ -129,6 +123,78 @@
     <ClInclude Include="..\..\..\unittest-cpp\UnitTest++\Win32\TimeHelpers.h">
       <Filter>UnitTest++\Win32</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\doxygen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\enum_type.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\exception.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\function.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\array.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\iqueue.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\istack.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\container.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ivector.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\queue.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\queue_base.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stack.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\stack_base.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\vector.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\vector_base.h">
+      <Filter>ETL\Containers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\largest.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\nullptr.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\numeric.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\cyclic_value.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\static_assert.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\type_traits.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\visitor.h">
+      <Filter>ETL\Patterns</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\maths.h">
+      <Filter>ETL\Maths</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\observer.h">
+      <Filter>ETL\Patterns</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\unittest-cpp\UnitTest++\AssertException.cpp">
@@ -191,5 +257,52 @@
     <ClCompile Include="..\test_array.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\test_enum_type.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_exception.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_function.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_math.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_stack.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_vector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_largest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_numeric.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_container.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_type_traits.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_cyclic_value.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_visitor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\test_observer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Doxyfile">
+      <Filter>Header Files</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file