From dd24ffac8923f62a5f98f7e28bd4720987ee1e5c Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Wed, 19 Jan 2011 04:05:30 +0000
Subject: [PATCH] Do some grouping of source files in the VC10 project file.

Originally committed to SVN as r5242.
---
 .../msbuild/Aegisub/Aegisub.vcxproj.filters   | 2015 +++++++++--------
 1 file changed, 1072 insertions(+), 943 deletions(-)

diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
index 73e5db7e1..93bc22d69 100644
--- a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
+++ b/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
@@ -1,1076 +1,1205 @@
 <?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>
     <Filter Include="Commands">
       <UniqueIdentifier>{b5d22cd4-b7ec-48ad-b78b-948b41e5dc15}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ASS">
+      <UniqueIdentifier>{9aad5f25-72b4-4438-9899-b0c405ab5995}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Automation">
+      <UniqueIdentifier>{4125e713-d173-48b3-ae2f-e19b889cc926}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Controls">
+      <UniqueIdentifier>{2617cdfa-8833-495b-9f75-4950210c628d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utilities">
+      <UniqueIdentifier>{90b18753-1a32-47a0-869d-64ae16e8732d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Subtitle formats">
+      <UniqueIdentifier>{4f326b57-8caa-4f6f-90c4-185cf3efc317}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Config">
+      <UniqueIdentifier>{5977a633-1e03-4503-83c6-d3c8994c8002}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{97c0a35b-30d3-48ca-9b6a-ab7b97351f9e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features">
+      <UniqueIdentifier>{93bfdee7-d33e-466e-ae04-93157adcfa46}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Audio">
+      <UniqueIdentifier>{3df67931-35ea-4b94-97eb-adb652294046}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Video">
+      <UniqueIdentifier>{3a5174c9-548b-47a0-a25d-2d03111fb5a7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Audio\Providers">
+      <UniqueIdentifier>{113403b0-d0ed-4cc0-a806-9c2802cf9042}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Audio\Players">
+      <UniqueIdentifier>{479b034b-3b4d-4225-9fb0-061f469ff90f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Audio\UI">
+      <UniqueIdentifier>{d20479a0-e0cf-47af-a57f-7be8989fb489}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Video\Providers">
+      <UniqueIdentifier>{4079897b-063b-432c-9554-f9302fef4d50}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Video\UI">
+      <UniqueIdentifier>{d8a621a5-3f03-409b-94be-ad2295e1ee36}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Video\Subtitle renderers">
+      <UniqueIdentifier>{aaf66839-8213-4eba-9b2a-13576b5529d0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Attachments">
+      <UniqueIdentifier>{0f4d31a3-388e-4927-af19-7da06b86f279}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Style editor">
+      <UniqueIdentifier>{c69ec6d0-05f4-45d1-878e-5130e6fd3a53}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Font collector">
+      <UniqueIdentifier>{048d6559-42b4-4dca-af9a-b9b15b6013f7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Export">
+      <UniqueIdentifier>{01522e6d-8711-4a71-b9b8-a94a24ef0de0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Automation\Lua">
+      <UniqueIdentifier>{1f3f1f35-6805-4367-871d-b7e876fe88ab}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Automation\UI">
+      <UniqueIdentifier>{ac0a16bb-3474-4468-8a75-e094f32759e6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Paste Over">
+      <UniqueIdentifier>{822cb96c-6c7c-4602-93cb-5fdd8fd81559}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Shift Times">
+      <UniqueIdentifier>{a7868613-b0f5-4460-ab27-6be2f75b0b4b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Translation Assistant">
+      <UniqueIdentifier>{e0404060-b33b-4a55-8181-b5dbb36bfa95}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Colour picker">
+      <UniqueIdentifier>{98daa273-a000-4c7c-b40a-887e96441885}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Karaoke copier">
+      <UniqueIdentifier>{e58def38-4472-43c0-ad27-e5c461aaf8f7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Spell checker">
+      <UniqueIdentifier>{b480102a-5ea0-4397-96c5-8ddb6f0368b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Thesaurus">
+      <UniqueIdentifier>{db74dafc-a06f-4750-9af7-d9a9ed69b21e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Resolution resampler">
+      <UniqueIdentifier>{5093b49a-3cb0-4b01-b301-51994f2020dd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Import">
+      <UniqueIdentifier>{c22e763b-46cf-415f-8bc7-0ca7f7a8c480}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Timing post-processor">
+      <UniqueIdentifier>{2a4cb9b1-8651-4b71-bdca-e14fe33d8f47}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Styling assistant">
+      <UniqueIdentifier>{a789b2c9-c65c-4a60-a25d-caa32f5aa1d0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Update checker">
+      <UniqueIdentifier>{ba371dc7-556e-4e45-a5bd-3d9013bf0e29}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Video\Visual tools">
+      <UniqueIdentifier>{7b32f9be-de39-4892-9afc-0656d4dfff91}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="AV support">
+      <UniqueIdentifier>{e555b022-7aaf-483e-9b88-9a407f29e9c8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Main UI">
+      <UniqueIdentifier>{cea88d45-ff52-425f-b552-69d126142a34}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Main UI\Grid">
+      <UniqueIdentifier>{8c5b1ccb-1afc-4d50-ada9-884e4cca2f1b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Main UI\Edit box">
+      <UniqueIdentifier>{423c43df-bad0-443b-9252-17c4b3e196f7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Help">
+      <UniqueIdentifier>{7ece8180-ee96-41f3-8fe6-d1dd38eae79c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\About box">
+      <UniqueIdentifier>{76ce8128-70e2-4d8f-8e8e-5336bacd2aec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Conditional select lines">
+      <UniqueIdentifier>{18a9fba6-a508-4818-be63-244453b7a253}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\Search-replace">
+      <UniqueIdentifier>{9d6859f4-b01a-43d7-be84-2694076fc064}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utilities\UI utilities">
+      <UniqueIdentifier>{9f657627-e879-4f7b-bb40-b65d9ba2cd12}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utilities\Logging">
+      <UniqueIdentifier>{d6c66065-8df9-4897-a37f-1f3c31d0e7ce}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Features\File properties">
+      <UniqueIdentifier>{258406b7-fae3-494a-80ff-80410051be27}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Preferences">
+      <UniqueIdentifier>{39646be7-5dce-471c-ab93-1e3f7f6f9fe1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SrcDir)aegisublocale.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)aegisub_endian.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)agi_pre.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)ass_attachment.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)ass_time.h">
+      <Filter>ASS</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)ass_dialogue.h">
-      <Filter>Header Files</Filter>
+      <Filter>ASS</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)ass_entry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)ass_exporter.h">
-      <Filter>Header Files</Filter>
+      <Filter>ASS</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)ass_export_filter.h">
-      <Filter>Header Files</Filter>
+      <Filter>ASS</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)ass_exporter.h">
+      <Filter>ASS</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)ass_file.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)ass_karaoke.h">
-      <Filter>Header Files</Filter>
+      <Filter>ASS</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)ass_override.h">
-      <Filter>Header Files</Filter>
+      <Filter>ASS</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)ass_style.h">
-      <Filter>Header Files</Filter>
+      <Filter>ASS</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)ass_style_storage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)ass_time.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_box.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_colorscheme.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_controller.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_display.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_karaoke.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_player_alsa.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_player_dsound.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_player_dsound2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_player_openal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_player_oss.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_player_portaudio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_player_pulse.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_provider_avs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_provider_convert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_provider_downmix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_provider_dummy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_provider_ffmpegsource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_provider_hd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)audio_provider_pcm.h">
-      <Filter>Header Files</Filter>
+      <Filter>ASS</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)audio_provider_ram.h">
-      <Filter>Header Files</Filter>
+      <Filter>Audio\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_provider_avs.h">
+      <Filter>Audio\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_provider_convert.h">
+      <Filter>Audio\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_provider_downmix.h">
+      <Filter>Audio\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_provider_dummy.h">
+      <Filter>Audio\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_provider_ffmpegsource.h">
+      <Filter>Audio\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_provider_hd.h">
+      <Filter>Audio\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_provider_pcm.h">
+      <Filter>Audio\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_box.h">
+      <Filter>Audio\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_colorscheme.h">
+      <Filter>Audio\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_display.h">
+      <Filter>Audio\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_karaoke.h">
+      <Filter>Audio\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)audio_renderer.h">
-      <Filter>Header Files</Filter>
+      <Filter>Audio\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)audio_renderer_spectrum.h">
-      <Filter>Header Files</Filter>
+      <Filter>Audio\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)audio_renderer_waveform.h">
-      <Filter>Header Files</Filter>
+      <Filter>Audio\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)audio_timing.h">
-      <Filter>Header Files</Filter>
+      <Filter>Audio\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)auto4_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)auto4_lua.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)auto4_lua_factory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)auto4_lua_scriptreader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)avisynth.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)avisynth_wrap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)base_grid.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)block_cache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)browse_button.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)charset_conv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)charset_detect.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)colorspace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)colour_button.h">
-      <Filter>Header Files</Filter>
+      <Filter>Automation</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)command\command.h">
-      <Filter>Header Files</Filter>
+      <Filter>Commands</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)command\icon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)compat.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)browse_button.h">
+      <Filter>Controls</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)config.h">
-      <Filter>Header Files</Filter>
+      <Filter>Config</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_about.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)audio_player_pulse.h">
+      <Filter>Audio\Players</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_attachments.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)audio_player_alsa.h">
+      <Filter>Audio\Players</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_automation.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)audio_player_dsound.h">
+      <Filter>Audio\Players</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_colorpicker.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)audio_player_dsound2.h">
+      <Filter>Audio\Players</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_detached_video.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)audio_player_openal.h">
+      <Filter>Audio\Players</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_dummy_video.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)audio_player_oss.h">
+      <Filter>Audio\Players</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_export.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)audio_player_portaudio.h">
+      <Filter>Audio\Players</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_fonts_collector.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)aegisub_endian.h">
+      <Filter>Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_jumpto.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_kara_timing_copy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_paste_over.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_progress.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_properties.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_resample.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_search_replace.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_selected_choices.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_selection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_shift_times.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_spellchecker.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_style_editor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_style_manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_styling_assistant.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_text_import.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_timing_processor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_translation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_version_check.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)dialog_video_details.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)drop.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)export_clean_info.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)export_fixstyle.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)export_framerate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)factory_manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)ffmpegsource_common.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)block_cache.h">
+      <Filter>Utilities</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)fft.h">
-      <Filter>Header Files</Filter>
+      <Filter>Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_attachments.h">
+      <Filter>Features\Attachments</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_jumpto.h">
+      <Filter>Video\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_video_details.h">
+      <Filter>Video\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_style_manager.h">
+      <Filter>Features\Style editor</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_style_editor.h">
+      <Filter>Features\Style editor</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)font_file_lister.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)font_file_lister_fontconfig.h">
-      <Filter>Header Files</Filter>
+      <Filter>Features\Font collector</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)font_file_lister_freetype.h">
-      <Filter>Header Files</Filter>
+      <Filter>Features\Font collector</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)frame_main.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)font_file_lister_fontconfig.h">
+      <Filter>Features\Font collector</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)gl_text.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)dialog_fonts_collector.h">
+      <Filter>Features\Font collector</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_dummy_video.h">
+      <Filter>Video\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_detached_video.h">
+      <Filter>Video\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_export.h">
+      <Filter>Features\Export</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)export_framerate.h">
+      <Filter>Features\Export</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)export_clean_info.h">
+      <Filter>Features\Export</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)export_fixstyle.h">
+      <Filter>Features\Export</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)auto4_lua_scriptreader.h">
+      <Filter>Automation\Lua</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)auto4_lua.h">
+      <Filter>Automation\Lua</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)auto4_lua_factory.h">
+      <Filter>Automation\Lua</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_automation.h">
+      <Filter>Automation\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_paste_over.h">
+      <Filter>Features\Paste Over</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_shift_times.h">
+      <Filter>Features\Shift Times</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_translation.h">
+      <Filter>Features\Translation Assistant</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)colorspace.h">
+      <Filter>Features\Colour picker</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_colorpicker.h">
+      <Filter>Features\Colour picker</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_kara_timing_copy.h">
+      <Filter>Features\Karaoke copier</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)gl_wrap.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video\UI</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)help_button.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)hotkeys.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)gl_text.h">
+      <Filter>Video\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)kana_table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)keyframe.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)main.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)MatroskaParser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)md5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)mkv_wrap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)mythes.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)plugin_manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)preferences.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)preferences_base.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)scintilla_text_ctrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)selection_controller.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)spellchecker_hunspell.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)spline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)spline_curve.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)standard_paths.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)static_bmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)string_codec.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subs_edit_box.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subs_edit_ctrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subs_grid.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subs_preview.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitles_provider_csri.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitles_provider_libass.h">
-      <Filter>Header Files</Filter>
+      <Filter>Features\Karaoke copier</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)subtitle_format.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitle_format_ass.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitle_format_dvd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitle_format_encore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitle_format_microdvd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitle_format_mkv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitle_format_srt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitle_format_transtation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)subtitle_format_ttxt.h">
-      <Filter>Header Files</Filter>
+      <Filter>Subtitle formats</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)subtitle_format_txt.h">
-      <Filter>Header Files</Filter>
+      <Filter>Subtitle formats</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)text_file_reader.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)subtitle_format_ass.h">
+      <Filter>Subtitle formats</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)text_file_writer.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)subtitle_format_dvd.h">
+      <Filter>Subtitle formats</Filter>
     </ClInclude>
-    <ClInclude Include="$(SrcDir)thesaurus.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="$(SrcDir)subtitle_format_encore.h">
+      <Filter>Subtitle formats</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subtitle_format_microdvd.h">
+      <Filter>Subtitle formats</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subtitle_format_mkv.h">
+      <Filter>Subtitle formats</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subtitle_format_srt.h">
+      <Filter>Subtitle formats</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subtitle_format_transtation.h">
+      <Filter>Subtitle formats</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subtitle_format_ttxt.h">
+      <Filter>Subtitle formats</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_spellchecker.h">
+      <Filter>Features\Spell checker</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)spellchecker_hunspell.h">
+      <Filter>Features\Spell checker</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)mythes.hxx">
+      <Filter>Features\Thesaurus</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)thesaurus_myspell.h">
-      <Filter>Header Files</Filter>
+      <Filter>Features\Thesaurus</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)thesaurus.h">
+      <Filter>Features\Thesaurus</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_resample.h">
+      <Filter>Features\Resolution resampler</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_text_import.h">
+      <Filter>Features\Import</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_timing_processor.h">
+      <Filter>Features\Timing post-processor</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_styling_assistant.h">
+      <Filter>Features\Styling assistant</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_version_check.h">
+      <Filter>Features\Update checker</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)threaded_frame_source.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)timeedit_ctrl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)toggle_bitmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)tooltip_manager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)validators.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)variable_data.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)vector2d.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)vfw_wrap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)video_box.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video\Providers</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)video_context.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)video_display.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)video_frame.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)video_box.h">
+      <Filter>Video\UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)video_display.h">
+      <Filter>Video\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)video_out_gl.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)video_provider_avs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)video_provider_cache.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)video_provider_dummy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)video_provider_ffmpegsource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)video_provider_manager.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video\Providers</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)video_provider_yuv4mpeg.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)video_provider_cache.h">
+      <Filter>Video\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)video_provider_dummy.h">
+      <Filter>Video\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)video_provider_ffmpegsource.h">
+      <Filter>Video\Providers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)video_provider_manager.h">
+      <Filter>Video\Providers</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)video_slider.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video\UI</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)visual_feature.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)visual_tool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)visual_tool_clip.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)visual_tool_cross.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)visual_tool_drag.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)visual_tool_rotatexy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)visual_tool_rotatez.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(SrcDir)visual_tool_scale.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video\Visual tools</Filter>
     </ClInclude>
     <ClInclude Include="$(SrcDir)visual_tool_vector_clip.h">
-      <Filter>Header Files</Filter>
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)visual_tool.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)visual_tool_clip.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)visual_tool_cross.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)visual_tool_drag.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)visual_tool_rotatexy.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)visual_tool_rotatez.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)visual_tool_scale.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)audio_controller.h">
+      <Filter>Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)avisynth.h">
+      <Filter>AV support</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)avisynth_wrap.h">
+      <Filter>AV support</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)ffmpegsource_common.h">
+      <Filter>AV support</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)vfw_wrap.h">
+      <Filter>AV support</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)MatroskaParser.h">
+      <Filter>AV support</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)keyframe.h">
+      <Filter>Video</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)mkv_wrap.h">
+      <Filter>AV support</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subtitles_provider_csri.h">
+      <Filter>Video\Subtitle renderers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subtitles_provider_libass.h">
+      <Filter>Video\Subtitle renderers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subs_preview.h">
+      <Filter>Features\Style editor</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)md5.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)string_codec.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)agi_pre.h">
+      <Filter>Config</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)frame_main.h">
+      <Filter>Main UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)main.h">
+      <Filter>Main UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)base_grid.h">
+      <Filter>Main UI\Grid</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)scintilla_text_ctrl.h">
+      <Filter>Main UI\Edit box</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)selection_controller.h">
+      <Filter>Main UI\Grid</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subs_edit_ctrl.h">
+      <Filter>Main UI\Edit box</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subs_edit_box.h">
+      <Filter>Main UI\Edit box</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)subs_grid.h">
+      <Filter>Main UI\Grid</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)charset_detect.h">
+      <Filter>Features\Import</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)charset_conv.h">
+      <Filter>Features\Import</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)help_button.h">
+      <Filter>Features\Help</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)colour_button.h">
+      <Filter>Features\Colour picker</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)drop.h">
+      <Filter>Main UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)aegisublocale.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)compat.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)factory_manager.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)hotkeys.h">
+      <Filter>Main UI</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)command\icon.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)plugin_manager.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)spline_curve.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)spline.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)standard_paths.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)version.h">
+      <Filter>Features\About box</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_about.h">
+      <Filter>Features\About box</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_selection.h">
+      <Filter>Features\Conditional select lines</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_search_replace.h">
+      <Filter>Features\Search-replace</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_selected_choices.h">
+      <Filter>Utilities\UI utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_progress.h">
+      <Filter>Utilities\UI utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_log.h">
+      <Filter>Utilities\Logging</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)utils.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)dialog_properties.h">
+      <Filter>Features\File properties</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)ass_karaoke.h">
+      <Filter>ASS</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)ass_attachment.h">
+      <Filter>ASS</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)validators.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)variable_data.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)tooltip_manager.h">
+      <Filter>Features\Help</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)timeedit_ctrl.h">
+      <Filter>Controls</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)text_file_writer.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)text_file_reader.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)toggle_bitmap.h">
+      <Filter>Controls</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)static_bmp.h">
+      <Filter>Controls</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)vector2d.h">
+      <Filter>Video\Visual tools</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)preferences_base.h">
+      <Filter>Preferences</Filter>
+    </ClInclude>
+    <ClInclude Include="$(SrcDir)preferences.h">
+      <Filter>Preferences</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(SrcDir)aegisublocale.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)agi_pre.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)ass_attachment.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(SrcDir)ass_dialogue.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>ASS</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)ass_entry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)ass_exporter.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>ASS</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)ass_export_filter.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>ASS</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)ass_exporter.cpp">
+      <Filter>ASS</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)ass_file.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)ass_karaoke.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>ASS</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)ass_override.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>ASS</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)ass_style.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>ASS</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)ass_style_storage.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>ASS</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)ass_time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_box.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_colorscheme.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_controller.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_display.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_karaoke.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_player.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_player_alsa.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_player_dsound.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_player_dsound2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_player_openal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_player_oss.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_player_portaudio.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_player_pulse.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_provider.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_provider_avs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_provider_convert.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_provider_downmix.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_provider_dummy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_provider_ffmpegsource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_provider_hd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)audio_provider_pcm.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>ASS</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)audio_provider_ram.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_provider.cpp">
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_provider_avs.cpp">
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_provider_convert.cpp">
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_provider_downmix.cpp">
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_provider_dummy.cpp">
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_provider_ffmpegsource.cpp">
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_provider_hd.cpp">
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_provider_pcm.cpp">
+      <Filter>Audio\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_box.cpp">
+      <Filter>Audio\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_colorscheme.cpp">
+      <Filter>Audio\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_display.cpp">
+      <Filter>Audio\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_karaoke.cpp">
+      <Filter>Audio\UI</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)audio_renderer.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Audio\UI</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)audio_renderer_spectrum.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Audio\UI</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)audio_renderer_waveform.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Audio\UI</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)audio_timing_dialogue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)auto4_base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)auto4_lua.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)auto4_lua_assfile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)auto4_lua_dialog.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)auto4_lua_scriptreader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)avisynth_wrap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)base_grid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)browse_button.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)charset_conv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)charset_detect.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)colorspace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)colour_button.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Audio\UI</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)command\app.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Commands</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)command\audio.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="$(SrcDir)auto4_base.cpp">
+      <Filter>Automation</Filter>
     </ClCompile>
-    <ClCompile Include="$(SrcDir)command\automation.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="$(SrcDir)browse_button.cpp">
+      <Filter>Controls</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)command\command.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\edit.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\grid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\help.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\icon.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\keyframe.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\menu_.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\recent.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\subtitle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\time.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\timecode.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\tool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)command\video.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)compat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_about.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_attachments.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_automation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_colorpicker.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_detached_video.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_dummy_video.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_export.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_fonts_collector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_jumpto.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_kara_timing_copy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_log.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_paste_over.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_progress.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_properties.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_resample.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_search_replace.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_selected_choices.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_selection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_shift_times.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_spellchecker.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_style_editor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_style_manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_styling_assistant.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_text_import.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_timing_processor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_translation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_version_check.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)dialog_video_details.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)drop.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)export_clean_info.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)export_fixstyle.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)export_framerate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)ffmpegsource_common.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)fft.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)font_file_lister.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)font_file_lister_fontconfig.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)font_file_lister_freetype.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)frame_main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)gl_text.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)gl_wrap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)help_button.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)hotkey.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)kana_table.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)MatroskaParser.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)md5.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)menu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)mkv_wrap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)mythes.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)plugin_manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)preferences.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)preferences_base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)scintilla_text_ctrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)setup.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)spellchecker.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)spellchecker_hunspell.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)spline.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)spline_curve.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)standard_paths.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)static_bmp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)string_codec.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subs_edit_box.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subs_grid.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subs_preview.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitles_provider.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitles_provider_csri.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitles_provider_libass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format_ass.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format_dvd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format_encore.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format_microdvd.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format_mkv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format_srt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format_transtation.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format_ttxt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)subtitle_format_txt.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)text_file_reader.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)text_file_writer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)thesaurus.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)thesaurus_myspell.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)threaded_frame_source.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)timeedit_ctrl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)toggle_bitmap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)toolbar.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)tooltip_manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)validators.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)variable_data.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)vector2d.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)version.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)vfw_wrap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_box.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_context.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_display.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_frame.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_out_gl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_provider_avs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_provider_cache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_provider_dummy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_provider_ffmpegsource.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_provider_manager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_provider_yuv4mpeg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)video_slider.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Commands</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)visual_feature.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)visual_tool.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)visual_tool_clip.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)visual_tool_cross.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)visual_tool_drag.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)visual_tool_rotatexy.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)visual_tool_rotatez.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(SrcDir)visual_tool_scale.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Video\Visual tools</Filter>
     </ClCompile>
     <ClCompile Include="$(SrcDir)visual_tool_vector_clip.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)visual_tool.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)visual_tool_clip.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)visual_tool_cross.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)visual_tool_drag.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)visual_tool_rotatexy.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)visual_tool_rotatez.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)visual_tool_scale.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_provider_yuv4mpeg.cpp">
+      <Filter>Video\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_provider_avs.cpp">
+      <Filter>Video\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_provider_cache.cpp">
+      <Filter>Video\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_provider_dummy.cpp">
+      <Filter>Video\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_provider_ffmpegsource.cpp">
+      <Filter>Video\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_provider_manager.cpp">
+      <Filter>Video\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_out_gl.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_display.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_box.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format_txt.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format_ass.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format_dvd.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format_encore.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format_microdvd.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format_mkv.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format_srt.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format_transtation.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitle_format_ttxt.cpp">
+      <Filter>Subtitle formats</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitles_provider.cpp">
+      <Filter>Video\Subtitle renderers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitles_provider_libass.cpp">
+      <Filter>Video\Subtitle renderers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subtitles_provider_csri.cpp">
+      <Filter>Video\Subtitle renderers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\edit.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_player.cpp">
+      <Filter>Audio\Players</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_player_alsa.cpp">
+      <Filter>Audio\Players</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_player_dsound.cpp">
+      <Filter>Audio\Players</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_player_dsound2.cpp">
+      <Filter>Audio\Players</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_player_openal.cpp">
+      <Filter>Audio\Players</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_player_oss.cpp">
+      <Filter>Audio\Players</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_player_portaudio.cpp">
+      <Filter>Audio\Players</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_player_pulse.cpp">
+      <Filter>Audio\Players</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_frame.cpp">
+      <Filter>Video</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)fft.cpp">
+      <Filter>Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_attachments.cpp">
+      <Filter>Features\Attachments</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_jumpto.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_video_details.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_style_editor.cpp">
+      <Filter>Features\Style editor</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_style_manager.cpp">
+      <Filter>Features\Style editor</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)font_file_lister_fontconfig.cpp">
+      <Filter>Features\Font collector</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)font_file_lister_freetype.cpp">
+      <Filter>Features\Font collector</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_fonts_collector.cpp">
+      <Filter>Features\Font collector</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_detached_video.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_dummy_video.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_export.cpp">
+      <Filter>Features\Export</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)export_clean_info.cpp">
+      <Filter>Features\Export</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)export_fixstyle.cpp">
+      <Filter>Features\Export</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)export_framerate.cpp">
+      <Filter>Features\Export</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)auto4_lua.cpp">
+      <Filter>Automation\Lua</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)auto4_lua_assfile.cpp">
+      <Filter>Automation\Lua</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)auto4_lua_dialog.cpp">
+      <Filter>Automation\Lua</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)auto4_lua_scriptreader.cpp">
+      <Filter>Automation\Lua</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_automation.cpp">
+      <Filter>Automation\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_paste_over.cpp">
+      <Filter>Features\Paste Over</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_shift_times.cpp">
+      <Filter>Features\Shift Times</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_translation.cpp">
+      <Filter>Features\Translation Assistant</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)colorspace.cpp">
+      <Filter>Features\Colour picker</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_colorpicker.cpp">
+      <Filter>Features\Colour picker</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_kara_timing_copy.cpp">
+      <Filter>Features\Karaoke copier</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)font_file_lister.cpp">
+      <Filter>Features\Font collector</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)gl_text.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)gl_wrap.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)kana_table.cpp">
+      <Filter>Features\Karaoke copier</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_spellchecker.cpp">
+      <Filter>Features\Spell checker</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)spellchecker.cpp">
+      <Filter>Features\Spell checker</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)spellchecker_hunspell.cpp">
+      <Filter>Features\Spell checker</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)mythes.cxx">
+      <Filter>Features\Thesaurus</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)thesaurus.cpp">
+      <Filter>Features\Thesaurus</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)thesaurus_myspell.cpp">
+      <Filter>Features\Thesaurus</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_resample.cpp">
+      <Filter>Features\Resolution resampler</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_text_import.cpp">
+      <Filter>Features\Import</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_timing_processor.cpp">
+      <Filter>Features\Timing post-processor</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_styling_assistant.cpp">
+      <Filter>Features\Styling assistant</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_version_check.cpp">
+      <Filter>Features\Update checker</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)threaded_frame_source.cpp">
+      <Filter>Video\Providers</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_context.cpp">
+      <Filter>Video</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)video_slider.cpp">
+      <Filter>Video\UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)audio_controller.cpp">
+      <Filter>Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)avisynth_wrap.cpp">
+      <Filter>AV support</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)ffmpegsource_common.cpp">
+      <Filter>AV support</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)vfw_wrap.cpp">
+      <Filter>AV support</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)MatroskaParser.c">
+      <Filter>AV support</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\keyframe.cpp">
+      <Filter>Video</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)mkv_wrap.cpp">
+      <Filter>AV support</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subs_preview.cpp">
+      <Filter>Features\Style editor</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)md5.c">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)string_codec.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)setup.cpp">
+      <Filter>Config</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)frame_main.cpp">
+      <Filter>Main UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)agi_pre.cpp">
+      <Filter>Config</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)main.cpp">
+      <Filter>Main UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)base_grid.cpp">
+      <Filter>Main UI\Grid</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)scintilla_text_ctrl.cpp">
+      <Filter>Main UI\Edit box</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subs_edit_box.cpp">
+      <Filter>Main UI\Edit box</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subs_edit_ctrl.cpp">
+      <Filter>Main UI\Edit box</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)subs_grid.cpp">
+      <Filter>Main UI\Grid</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)charset_conv.cpp">
+      <Filter>Features\Import</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)charset_detect.cpp">
+      <Filter>Features\Import</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)help_button.cpp">
+      <Filter>Features\Help</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)colour_button.cpp">
+      <Filter>Features\Colour picker</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)drop.cpp">
+      <Filter>Main UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)aegisublocale.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)compat.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)hotkey.cpp">
+      <Filter>Main UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\icon.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)menu.cpp">
+      <Filter>Main UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)plugin_manager.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)spline.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)spline_curve.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)standard_paths.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\subtitle.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)version.cpp">
+      <Filter>Features\About box</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_about.cpp">
+      <Filter>Features\About box</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_selection.cpp">
+      <Filter>Features\Conditional select lines</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_search_replace.cpp">
+      <Filter>Features\Search-replace</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_selected_choices.cpp">
+      <Filter>Utilities\UI utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_progress.cpp">
+      <Filter>Utilities\UI utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_log.cpp">
+      <Filter>Utilities\Logging</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\time.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\tool.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)utils.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)dialog_properties.cpp">
+      <Filter>Features\File properties</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)ass_karaoke.cpp">
+      <Filter>ASS</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)ass_attachment.cpp">
+      <Filter>ASS</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\help.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)toolbar.cpp">
+      <Filter>Main UI</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\grid.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\recent.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)validators.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)variable_data.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)tooltip_manager.cpp">
+      <Filter>Features\Help</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)timeedit_ctrl.cpp">
+      <Filter>Controls</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)text_file_reader.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)text_file_writer.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)toggle_bitmap.cpp">
+      <Filter>Controls</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)static_bmp.cpp">
+      <Filter>Controls</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)vector2d.cpp">
+      <Filter>Video\Visual tools</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)preferences.cpp">
+      <Filter>Preferences</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)preferences_base.cpp">
+      <Filter>Preferences</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\audio.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\automation.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\menu_.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\timecode.cpp">
+      <Filter>Commands</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)command\video.cpp">
+      <Filter>Commands</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="$(SrcDir)res.rc">
-      <Filter>Resource Files</Filter>
+      <Filter>Resources</Filter>
     </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file