diff --git a/build/kvazaar_cli/kvazaar_cli.vcxproj b/build/kvazaar_cli/kvazaar_cli.vcxproj
index 2abe3437..173acd36 100644
--- a/build/kvazaar_cli/kvazaar_cli.vcxproj
+++ b/build/kvazaar_cli/kvazaar_cli.vcxproj
@@ -87,7 +87,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\interface_main.c" />
+    <ClCompile Include="..\..\src\cli.c" />
+    <ClCompile Include="..\..\src\encmain.c" />
+    <ClCompile Include="..\..\src\yuv_io.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\cli.h" />
+    <ClInclude Include="..\..\src\yuv_io.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/kvazaar_cli/kvazaar_cli.vcxproj.filters b/build/kvazaar_cli/kvazaar_cli.vcxproj.filters
index b848df5d..0f16c487 100644
--- a/build/kvazaar_cli/kvazaar_cli.vcxproj.filters
+++ b/build/kvazaar_cli/kvazaar_cli.vcxproj.filters
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
+    <ClCompile Include="..\..\src\cli.c" />
+    <ClCompile Include="..\..\src\yuv_io.c" />
+    <ClCompile Include="..\..\src\encmain.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\interface_main.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClInclude Include="..\..\src\yuv_io.h" />
+    <ClInclude Include="..\..\src\cli.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/kvazaar_lib/kvazaar_lib.vcxproj b/build/kvazaar_lib/kvazaar_lib.vcxproj
index a4af9567..610438ed 100644
--- a/build/kvazaar_lib/kvazaar_lib.vcxproj
+++ b/build/kvazaar_lib/kvazaar_lib.vcxproj
@@ -129,11 +129,9 @@
     <ClCompile Include="..\..\src\kvazaar.c" />
     <ClCompile Include="..\..\src\bitstream.c" />
     <ClCompile Include="..\..\src\cabac.c" />
-    <ClCompile Include="..\..\src\cli.c" />
     <ClCompile Include="..\..\src\config.c" />
     <ClCompile Include="..\..\src\context.c" />
     <ClCompile Include="..\..\src\cu.c" />
-    <ClCompile Include="..\..\src\encmain.c" />
     <ClCompile Include="..\..\src\encoder.c" />
     <ClCompile Include="..\..\src\encoderstate.c" />
     <ClCompile Include="..\..\src\encoder_state-bitstream.c" />
@@ -169,9 +167,7 @@
     <ClCompile Include="..\..\src\strategies\generic\quant-generic.c" />
     <ClCompile Include="..\..\src\strategies\strategies-intra.c" />
     <ClCompile Include="..\..\src\strategies\strategies-quant.c" />
-    <ClCompile Include="..\..\src\yuv_io.c" />
     <ClInclude Include="..\..\src\checkpoint.h" />
-    <ClInclude Include="..\..\src\cli.h" />
     <ClInclude Include="..\..\src\cu.h" />
     <ClInclude Include="..\..\src\image.h" />
     <ClInclude Include="..\..\src\imagelist.h" />
@@ -224,7 +220,6 @@
     <ClInclude Include="..\..\src\strategies\generic\quant-generic.h" />
     <ClInclude Include="..\..\src\strategies\strategies-intra.h" />
     <ClInclude Include="..\..\src\strategies\strategies-quant.h" />
-    <ClInclude Include="..\..\src\yuv_io.h" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\bitstream.h" />
diff --git a/build/kvazaar_lib/kvazaar_lib.vcxproj.filters b/build/kvazaar_lib/kvazaar_lib.vcxproj.filters
index c874bea8..518a42b1 100644
--- a/build/kvazaar_lib/kvazaar_lib.vcxproj.filters
+++ b/build/kvazaar_lib/kvazaar_lib.vcxproj.filters
@@ -1,428 +1,400 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    <Filter Include="Control">
+      <UniqueIdentifier>{c7f0ebb9-e5c1-479d-bb12-c2403f551ae0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    <Filter Include="Bitstream">
+      <UniqueIdentifier>{2d160ce0-596b-4f8c-ae61-1ddd5ccbe1ea}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    <Filter Include="Compression">
+      <UniqueIdentifier>{871a51e7-0a11-4870-ad93-0809af9a2412}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\strategies">
-      <UniqueIdentifier>{84b28f88-c0de-4ee8-8566-c2c56d2b0f6e}</UniqueIdentifier>
+    <Filter Include="Reconstruction">
+      <UniqueIdentifier>{8a1eee84-49e9-4e2d-9681-a23a774cdb18}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\strategies">
+    <Filter Include="Optimization">
+      <UniqueIdentifier>{1dce39e5-50a3-4cd7-adfa-6d382446debd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Optimization\strategies">
       <UniqueIdentifier>{aa218f1d-2e13-425d-80a7-3f4d74076c5c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\strategies\generic">
+    <Filter Include="Optimization\strategies\generic">
       <UniqueIdentifier>{e4e77a4f-e708-4b11-9ba7-9d2b746e3f5d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\strategies\sse2">
+    <Filter Include="Optimization\strategies\sse2">
       <UniqueIdentifier>{0c7b7451-4b19-443f-b51c-588e63bb4c93}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\strategies\sse41">
+    <Filter Include="Optimization\strategies\sse41">
       <UniqueIdentifier>{2b47e32d-3fee-4a34-a4cb-8453b769b1b0}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\strategies\altivec">
+    <Filter Include="Optimization\strategies\altivec">
       <UniqueIdentifier>{770e42cd-56bc-4377-af83-c14872722ed2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\strategies\generic">
-      <UniqueIdentifier>{62b39266-3f82-421d-91df-7f12caa817ad}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\strategies\sse2">
-      <UniqueIdentifier>{675b31f0-f1a3-4b1f-b436-ae24c2ab7279}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\strategies\sse41">
-      <UniqueIdentifier>{1e811a93-2291-426e-951b-0c1137af77f7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\strategies\altivec">
-      <UniqueIdentifier>{9e275b7f-3094-4614-b817-6ce0bee827b2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\extras">
-      <UniqueIdentifier>{7b258ce6-90d8-4e47-ab43-babda9eefbd9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\strategies\avx2">
-      <UniqueIdentifier>{80a08f4c-ca27-488b-bd63-8df6eacd1f3a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\strategies\avx2">
+    <Filter Include="Optimization\strategies\avx2">
       <UniqueIdentifier>{4ffb5d27-c5bb-44d5-a935-fa93066a259e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\strategies\x86_asm">
+    <Filter Include="Optimization\strategies\x86_asm">
       <UniqueIdentifier>{d0ce7d00-30c6-4e8a-b96e-51e13cb038ea}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\strategies\x86_asm">
-      <UniqueIdentifier>{62f151c5-cdcd-46e5-aaef-fe5fdd33dce4}</UniqueIdentifier>
+    <Filter Include="CABAC">
+      <UniqueIdentifier>{c696e039-5ba4-48ab-845d-cfe1a5713525}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Extras">
+      <UniqueIdentifier>{7b258ce6-90d8-4e47-ab43-babda9eefbd9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Data structures">
+      <UniqueIdentifier>{f4560af3-b3b4-47b4-b401-908f2d279847}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Threading">
+      <UniqueIdentifier>{63c21cb2-b379-4d38-bcb8-173786c2466d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\encmain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\config.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bitstream.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\encoder.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cabac.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\nal.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\intra.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\transform.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\context.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filter.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\search.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\inter.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sao.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rdo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\extras\getopt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scalinglist.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\tables.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\strategyselector.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\threadqueue.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\encoder_state-bitstream.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\encoder_state-ctors_dtors.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\encoder_state-geometry.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\encoderstate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\image.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\imagelist.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\videoframe.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cu.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\strategies\strategies-nal.c">
-      <Filter>Source Files\strategies</Filter>
+      <Filter>Optimization\strategies</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\strategies-picture.c">
-      <Filter>Source Files\strategies</Filter>
+      <Filter>Optimization\strategies</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\generic\nal-generic.c">
-      <Filter>Source Files\strategies\generic</Filter>
+      <Filter>Optimization\strategies\generic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\generic\picture-generic.c">
-      <Filter>Source Files\strategies\generic</Filter>
+      <Filter>Optimization\strategies\generic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\altivec\picture-altivec.c">
-      <Filter>Source Files\strategies\altivec</Filter>
+      <Filter>Optimization\strategies\altivec</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\sse41\picture-sse41.c">
-      <Filter>Source Files\strategies\sse41</Filter>
+      <Filter>Optimization\strategies\sse41</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\sse2\picture-sse2.c">
-      <Filter>Source Files\strategies\sse2</Filter>
+      <Filter>Optimization\strategies\sse2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\avx2\picture-avx2.c">
-      <Filter>Source Files\strategies\avx2</Filter>
+      <Filter>Optimization\strategies\avx2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\x86_asm\picture-x86-asm.c">
-      <Filter>Source Files\strategies\x86_asm</Filter>
+      <Filter>Optimization\strategies\x86_asm</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\avx2\dct-avx2.c">
-      <Filter>Source Files\strategies\avx2</Filter>
+      <Filter>Optimization\strategies\avx2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\generic\dct-generic.c">
-      <Filter>Source Files\strategies\generic</Filter>
+      <Filter>Optimization\strategies\generic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\strategies-dct.c">
-      <Filter>Source Files\strategies</Filter>
+      <Filter>Optimization\strategies</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\strategies-ipol.c">
-      <Filter>Source Files\strategies</Filter>
+      <Filter>Optimization\strategies</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\avx2\ipol-avx2.c">
-      <Filter>Source Files\strategies\avx2</Filter>
+      <Filter>Optimization\strategies\avx2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\generic\ipol-generic.c">
-      <Filter>Source Files\strategies\generic</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cli.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\kvazaar.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rate_control.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\yuv_io.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\search_inter.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\search_intra.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\input_frame_buffer.c">
-      <Filter>Source Files</Filter>
+      <Filter>Optimization\strategies\generic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\strategies-quant.c">
-      <Filter>Source Files\strategies</Filter>
+      <Filter>Optimization\strategies</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\generic\quant-generic.c">
-      <Filter>Source Files\strategies\generic</Filter>
+      <Filter>Optimization\strategies\generic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\avx2\quant-avx2.c">
-      <Filter>Source Files\strategies\avx2</Filter>
+      <Filter>Optimization\strategies\avx2</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\strategies-intra.c">
-      <Filter>Source Files\strategies</Filter>
+      <Filter>Optimization\strategies</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\generic\intra-generic.c">
-      <Filter>Source Files\strategies\generic</Filter>
+      <Filter>Optimization\strategies\generic</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\strategies\avx2\intra-avx2.c">
-      <Filter>Source Files\strategies\avx2</Filter>
+      <Filter>Optimization\strategies\avx2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\search.c">
+      <Filter>Compression</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\search_inter.c">
+      <Filter>Compression</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\search_intra.c">
+      <Filter>Compression</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\encoderstate.c">
+      <Filter>Control</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\encoder.c">
+      <Filter>Control</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\encoder_state-ctors_dtors.c">
+      <Filter>Control</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\encoder_state-geometry.c">
+      <Filter>Control</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cabac.c">
+      <Filter>CABAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\context.c">
+      <Filter>CABAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\bitstream.c">
+      <Filter>CABAC</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\config.c">
+      <Filter>Control</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filter.c">
+      <Filter>Reconstruction</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\extras\getopt.c">
+      <Filter>Extras</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\videoframe.c">
+      <Filter>Data structures</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cu.c">
+      <Filter>Data structures</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\image.c">
+      <Filter>Data structures</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\imagelist.c">
+      <Filter>Data structures</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rdo.c">
+      <Filter>Compression</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\inter.c">
+      <Filter>Reconstruction</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\intra.c">
+      <Filter>Reconstruction</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\kvazaar.c">
+      <Filter>Control</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\input_frame_buffer.c">
+      <Filter>Control</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\nal.c">
+      <Filter>Bitstream</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\rate_control.c">
+      <Filter>Control</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sao.c">
+      <Filter>Reconstruction</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\strategyselector.c">
+      <Filter>Optimization</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\transform.c">
+      <Filter>Reconstruction</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tables.c">
+      <Filter>Reconstruction</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\scalinglist.c">
+      <Filter>Reconstruction</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\threadqueue.c">
+      <Filter>Threading</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\encoder_state-bitstream.c">
+      <Filter>Bitstream</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\global.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\bitstream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\encoder.h">
-      <Filter>Header Files</Filter>
+      <Filter>CABAC</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\cabac.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\nal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\intra.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\transform.h">
-      <Filter>Header Files</Filter>
+      <Filter>CABAC</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\context.h">
-      <Filter>Header Files</Filter>
+      <Filter>CABAC</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\filter.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\src\config.h">
+      <Filter>Control</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\search.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\inter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sao.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\rdo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\extras\getopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\scalinglist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\tables.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\threads.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\threadqueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\encoderstate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\encoder_state-bitstream.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\src\encoder.h">
+      <Filter>Control</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\encoder_state-ctors_dtors.h">
-      <Filter>Header Files</Filter>
+      <Filter>Control</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\encoder_state-geometry.h">
-      <Filter>Header Files</Filter>
+      <Filter>Control</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\image.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\checkpoint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cu.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\imagelist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategyselector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\videoframe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\strategies-nal.h">
-      <Filter>Header Files\strategies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\strategies-picture.h">
-      <Filter>Header Files\strategies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\altivec\picture-altivec.h">
-      <Filter>Header Files\strategies\altivec</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\generic\nal-generic.h">
-      <Filter>Header Files\strategies\generic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\generic\picture-generic.h">
-      <Filter>Header Files\strategies\generic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\sse41\picture-sse41.h">
-      <Filter>Header Files\strategies\sse41</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\sse2\picture-sse2.h">
-      <Filter>Header Files\strategies\sse2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\avx2\picture-avx2.h">
-      <Filter>Header Files\strategies\avx2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\x86_asm\picture-x86-asm.h">
-      <Filter>Header Files\strategies\x86_asm</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\x86_asm\picture-x86-asm-sad.h">
-      <Filter>Header Files\strategies\x86_asm</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\x86_asm\picture-x86-asm-satd.h">
-      <Filter>Header Files\strategies\x86_asm</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\avx2\dct-avx2.h">
-      <Filter>Header Files\strategies\avx2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\strategies-dct.h">
-      <Filter>Header Files\strategies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\generic\dct-generic.h">
-      <Filter>Header Files\strategies\generic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\strategies-ipol.h">
-      <Filter>Header Files\strategies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\generic\ipol-generic.h">
-      <Filter>Header Files\strategies\generic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\avx2\ipol-avx2.h">
-      <Filter>Header Files\strategies\avx2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cli.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kvazaar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kvazaar_version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\rate_control.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\yuv_io.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\kvazaar_internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\search_inter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\search_intra.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\src\encoderstate.h">
+      <Filter>Control</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\input_frame_buffer.h">
-      <Filter>Header Files</Filter>
+      <Filter>Control</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\rate_control.h">
+      <Filter>Control</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\threads.h">
+      <Filter>Threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\threadqueue.h">
+      <Filter>Threading</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kvazaar.h">
+      <Filter>Control</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kvazaar_internal.h">
+      <Filter>Control</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\kvazaar_version.h">
+      <Filter>Control</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\videoframe.h">
+      <Filter>Data structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cu.h">
+      <Filter>Data structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\image.h">
+      <Filter>Data structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\imagelist.h">
+      <Filter>Data structures</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\extras\getopt.h">
+      <Filter>Extras</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\filter.h">
+      <Filter>Reconstruction</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\inter.h">
+      <Filter>Reconstruction</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\intra.h">
+      <Filter>Reconstruction</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sao.h">
+      <Filter>Reconstruction</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\scalinglist.h">
+      <Filter>Reconstruction</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\tables.h">
+      <Filter>Reconstruction</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\transform.h">
+      <Filter>Reconstruction</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\global.h" />
+    <ClInclude Include="..\..\src\checkpoint.h" />
+    <ClInclude Include="..\..\src\strategyselector.h">
+      <Filter>Optimization</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\search_intra.h">
+      <Filter>Compression</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\search.h">
+      <Filter>Compression</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\search_inter.h">
+      <Filter>Compression</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\nal.h">
+      <Filter>Bitstream</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\rdo.h">
+      <Filter>Compression</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\strategies\strategies-common.h">
-      <Filter>Header Files\strategies</Filter>
+      <Filter>Optimization\strategies</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\strategies\strategies-quant.h">
-      <Filter>Header Files\strategies</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\generic\quant-generic.h">
-      <Filter>Header Files\strategies\generic</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\strategies\avx2\quant-avx2.h">
-      <Filter>Header Files\strategies\avx2</Filter>
+    <ClInclude Include="..\..\src\strategies\strategies-dct.h">
+      <Filter>Optimization\strategies</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\strategies\strategies-intra.h">
-      <Filter>Header Files\strategies</Filter>
+      <Filter>Optimization\strategies</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\strategies-ipol.h">
+      <Filter>Optimization\strategies</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\strategies-nal.h">
+      <Filter>Optimization\strategies</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\strategies-picture.h">
+      <Filter>Optimization\strategies</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\strategies-quant.h">
+      <Filter>Optimization\strategies</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\x86_asm\picture-x86-asm.h">
+      <Filter>Optimization\strategies\x86_asm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\x86_asm\picture-x86-asm-sad.h">
+      <Filter>Optimization\strategies\x86_asm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\x86_asm\picture-x86-asm-satd.h">
+      <Filter>Optimization\strategies\x86_asm</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\sse41\picture-sse41.h">
+      <Filter>Optimization\strategies\sse41</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\sse2\picture-sse2.h">
+      <Filter>Optimization\strategies\sse2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\generic\dct-generic.h">
+      <Filter>Optimization\strategies\generic</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\strategies\generic\intra-generic.h">
-      <Filter>Header Files\strategies\generic</Filter>
+      <Filter>Optimization\strategies\generic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\generic\ipol-generic.h">
+      <Filter>Optimization\strategies\generic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\generic\nal-generic.h">
+      <Filter>Optimization\strategies\generic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\generic\picture-generic.h">
+      <Filter>Optimization\strategies\generic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\generic\quant-generic.h">
+      <Filter>Optimization\strategies\generic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\avx2\dct-avx2.h">
+      <Filter>Optimization\strategies\avx2</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\strategies\avx2\intra-avx2.h">
-      <Filter>Header Files\strategies\avx2</Filter>
+      <Filter>Optimization\strategies\avx2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\avx2\ipol-avx2.h">
+      <Filter>Optimization\strategies\avx2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\avx2\picture-avx2.h">
+      <Filter>Optimization\strategies\avx2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\avx2\quant-avx2.h">
+      <Filter>Optimization\strategies\avx2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\strategies\altivec\picture-altivec.h">
+      <Filter>Optimization\strategies\altivec</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\encoder_state-bitstream.h">
+      <Filter>Bitstream</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <YASM Include="..\..\src\extras\x86inc.asm">
-      <Filter>Source Files\extras</Filter>
+      <Filter>Extras</Filter>
     </YASM>
     <YASM Include="..\..\src\strategies\x86_asm\picture-x86-asm-sad.asm">
-      <Filter>Source Files\strategies\x86_asm</Filter>
+      <Filter>Optimization\strategies\x86_asm</Filter>
     </YASM>
     <YASM Include="..\..\src\strategies\x86_asm\picture-x86-asm-satd.asm">
-      <Filter>Source Files\strategies\x86_asm</Filter>
+      <Filter>Optimization\strategies\x86_asm</Filter>
     </YASM>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/interface_main.c b/src/interface_main.c
deleted file mode 100644
index 2f6106da..00000000
--- a/src/interface_main.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
- *
- * Copyright (C) 2013-2015 Tampere University of Technology and others (see
- * COPYING file).
- *
- * Kvazaar is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version.
- *
- * Kvazaar is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
- ****************************************************************************/
-
-/**
- * \file
- * \brief Entry point for the Visual Studio project.
- *
- * This file is needed for Visual Studio, because it will not link the main
- * function from the .lib if the project has no .c files.
- *
- * \author Marko Viitanen ( fador@iki.fi ),
- *         Tampere University of Technology,
- *         Department of Pervasive Computing.
- * \author Ari Koivula ( ari@koivu.la ),
- *         Tampere University of Technology,
- *         Department of Pervasive Computing.
- */
-
-// This is not actually needed, because the linker will use the main from the
-// .lib of the encoder, but I will leave it here in case we encounter some
-// problem with that.
-/*
-int encmain(int argc, char *argv[]);
-
-int main(int argc, char *argv[])
-{
-  int i = 10;
-  while (i) {
-    --i;
-  }
-  return encmain(argc, argv);
-}
-*/