diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index 51dbb59ae..5ccee3d70 100644
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -28,7 +28,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;..\..\aegisub\config\config_windows.h&quot; (copy &quot;..\..\aegisub\config\config_windows0.h&quot; &quot;..\..\aegisub\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\aegisub&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;..\..\src\config\config_windows.h&quot; (copy &quot;..\..\src\config\config_windows0.h&quot; &quot;..\..\src\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\src&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -46,7 +46,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../hunspell/src;../../aegisub/msvc"
+				AdditionalIncludeDirectories="../../../contrib/hunspell/src;../../src/msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -114,7 +114,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;..\..\aegisub\config\config_windows.h&quot; (copy &quot;..\..\aegisub\config\config_windows0.h&quot; &quot;..\..\aegisub\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\aegisub&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;..\..\src\config\config_windows.h&quot; (copy &quot;..\..\src\config\config_windows0.h&quot; &quot;..\..\src\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\src&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -132,7 +132,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../hunspell/src"
+				AdditionalIncludeDirectories="../../../contrib/hunspell/src"
 				PreprocessorDefinitions="WIN32;WIN64;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -201,7 +201,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;..\..\aegisub\config\config_windows.h&quot; (copy &quot;..\..\aegisub\config\config_windows0.h&quot; &quot;..\..\aegisub\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\aegisub&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;..\..\src\config\config_windows.h&quot; (copy &quot;..\..\src\config\config_windows0.h&quot; &quot;..\..\src\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\src&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -219,7 +219,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../hunspell/src;../../aegisub/msvc"
+				AdditionalIncludeDirectories="../../../contrib/hunspell/src;../../src/msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="2"
 				OpenMP="true"
@@ -291,7 +291,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="if not exist &quot;..\..\aegisub\config\config_windows.h&quot; (copy &quot;..\..\aegisub\config\config_windows0.h&quot; &quot;..\..\aegisub\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\aegisub&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
+				CommandLine="if not exist &quot;..\..\src\config\config_windows.h&quot; (copy &quot;..\..\src\config\config_windows0.h&quot; &quot;..\..\src\config\config_windows.h&quot;)&#x0D;&#x0A;SubWCRev.exe &quot;..\..\src&quot; &quot;..\svn-revision-base.h&quot; &quot;..\svn-revision.h&quot;&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -308,7 +308,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../hunspell/src"
+				AdditionalIncludeDirectories="../../../contrib/hunspell/src"
 				PreprocessorDefinitions="WIN32;WIN64;NDEBUG;_WINDOWS"
 				RuntimeLibrary="2"
 				OpenMP="true"
@@ -376,91 +376,91 @@
 			Name="ASS"
 			>
 			<File
-				RelativePath="..\..\aegisub\ass_attachment.cpp"
+				RelativePath="..\..\src\ass_attachment.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_attachment.h"
+				RelativePath="..\..\src\ass_attachment.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_dialogue.cpp"
+				RelativePath="..\..\src\ass_dialogue.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_dialogue.h"
+				RelativePath="..\..\src\ass_dialogue.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_entry.cpp"
+				RelativePath="..\..\src\ass_entry.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_entry.h"
+				RelativePath="..\..\src\ass_entry.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_export_filter.cpp"
+				RelativePath="..\..\src\ass_export_filter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_export_filter.h"
+				RelativePath="..\..\src\ass_export_filter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_exporter.cpp"
+				RelativePath="..\..\src\ass_exporter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_exporter.h"
+				RelativePath="..\..\src\ass_exporter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_file.cpp"
+				RelativePath="..\..\src\ass_file.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_file.h"
+				RelativePath="..\..\src\ass_file.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_karaoke.cpp"
+				RelativePath="..\..\src\ass_karaoke.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_karaoke.h"
+				RelativePath="..\..\src\ass_karaoke.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_override.cpp"
+				RelativePath="..\..\src\ass_override.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_override.h"
+				RelativePath="..\..\src\ass_override.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_style.cpp"
+				RelativePath="..\..\src\ass_style.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_style.h"
+				RelativePath="..\..\src\ass_style.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_style_storage.cpp"
+				RelativePath="..\..\src\ass_style_storage.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_style_storage.h"
+				RelativePath="..\..\src\ass_style_storage.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_time.cpp"
+				RelativePath="..\..\src\ass_time.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ass_time.h"
+				RelativePath="..\..\src\ass_time.h"
 				>
 			</File>
 		</Filter>
@@ -468,179 +468,179 @@
 			Name="Audio"
 			>
 			<File
-				RelativePath="..\..\aegisub\audio_box.cpp"
+				RelativePath="..\..\src\audio_box.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_box.h"
+				RelativePath="..\..\src\audio_box.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_display.cpp"
+				RelativePath="..\..\src\audio_display.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_display.h"
+				RelativePath="..\..\src\audio_display.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_karaoke.cpp"
+				RelativePath="..\..\src\audio_karaoke.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_karaoke.h"
+				RelativePath="..\..\src\audio_karaoke.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player.cpp"
+				RelativePath="..\..\src\audio_player.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_alsa.cpp"
+				RelativePath="..\..\src\audio_player_alsa.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_alsa.h"
+				RelativePath="..\..\src\audio_player_alsa.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_dsound.cpp"
+				RelativePath="..\..\src\audio_player_dsound.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_dsound.h"
+				RelativePath="..\..\src\audio_player_dsound.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_dsound2.cpp"
+				RelativePath="..\..\src\audio_player_dsound2.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_dsound2.h"
+				RelativePath="..\..\src\audio_player_dsound2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_manager.h"
+				RelativePath="..\..\src\audio_player_manager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_openal.cpp"
+				RelativePath="..\..\src\audio_player_openal.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_openal.h"
+				RelativePath="..\..\src\audio_player_openal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_portaudio.cpp"
+				RelativePath="..\..\src\audio_player_portaudio.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_portaudio.h"
+				RelativePath="..\..\src\audio_player_portaudio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_pulse.cpp"
+				RelativePath="..\..\src\audio_player_pulse.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_player_pulse.h"
+				RelativePath="..\..\src\audio_player_pulse.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider.cpp"
+				RelativePath="..\..\src\audio_provider.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_avs.cpp"
+				RelativePath="..\..\src\audio_provider_avs.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_avs.h"
+				RelativePath="..\..\src\audio_provider_avs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_convert.cpp"
+				RelativePath="..\..\src\audio_provider_convert.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_convert.h"
+				RelativePath="..\..\src\audio_provider_convert.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_downmix.cpp"
+				RelativePath="..\..\src\audio_provider_downmix.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_downmix.h"
+				RelativePath="..\..\src\audio_provider_downmix.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_dummy.cpp"
+				RelativePath="..\..\src\audio_provider_dummy.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_dummy.h"
+				RelativePath="..\..\src\audio_provider_dummy.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_ffmpegsource.cpp"
+				RelativePath="..\..\src\audio_provider_ffmpegsource.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_ffmpegsource.h"
+				RelativePath="..\..\src\audio_provider_ffmpegsource.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_hd.cpp"
+				RelativePath="..\..\src\audio_provider_hd.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_hd.h"
+				RelativePath="..\..\src\audio_provider_hd.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_lavc.cpp"
+				RelativePath="..\..\src\audio_provider_lavc.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_lavc.h"
+				RelativePath="..\..\src\audio_provider_lavc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_manager.h"
+				RelativePath="..\..\src\audio_provider_manager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_pcm.cpp"
+				RelativePath="..\..\src\audio_provider_pcm.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_pcm.h"
+				RelativePath="..\..\src\audio_provider_pcm.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_ram.cpp"
+				RelativePath="..\..\src\audio_provider_ram.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_ram.h"
+				RelativePath="..\..\src\audio_provider_ram.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_stream.cpp"
+				RelativePath="..\..\src\audio_provider_stream.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_provider_stream.h"
+				RelativePath="..\..\src\audio_provider_stream.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_spectrum.cpp"
+				RelativePath="..\..\src\audio_spectrum.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\audio_spectrum.h"
+				RelativePath="..\..\src\audio_spectrum.h"
 				>
 			</File>
 		</Filter>
@@ -648,46 +648,46 @@
 			Name="Automation"
 			>
 			<File
-				RelativePath="..\..\aegisub\auto4_auto3.cpp"
+				RelativePath="..\..\src\auto4_auto3.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\auto4_auto3.h"
+				RelativePath="..\..\src\auto4_auto3.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\auto4_base.cpp"
+				RelativePath="..\..\src\auto4_base.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\auto4_base.h"
+				RelativePath="..\..\src\auto4_base.h"
 				>
 			</File>
 			<Filter
 				Name="Lua"
 				>
 				<File
-					RelativePath="..\..\aegisub\auto4_lua.cpp"
+					RelativePath="..\..\src\auto4_lua.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_lua.h"
+					RelativePath="..\..\src\auto4_lua.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_lua_assfile.cpp"
+					RelativePath="..\..\src\auto4_lua_assfile.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_lua_dialog.cpp"
+					RelativePath="..\..\src\auto4_lua_dialog.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_lua_scriptreader.cpp"
+					RelativePath="..\..\src\auto4_lua_scriptreader.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_lua_scriptreader.h"
+					RelativePath="..\..\src\auto4_lua_scriptreader.h"
 					>
 				</File>
 			</Filter>
@@ -695,19 +695,19 @@
 				Name="Ruby"
 				>
 				<File
-					RelativePath="..\..\aegisub\auto4_ruby.cpp"
+					RelativePath="..\..\src\auto4_ruby.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_ruby.h"
+					RelativePath="..\..\src\auto4_ruby.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_ruby_assfile.cpp"
+					RelativePath="..\..\src\auto4_ruby_assfile.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_ruby_dialog.cpp"
+					RelativePath="..\..\src\auto4_ruby_dialog.cpp"
 					>
 				</File>
 			</Filter>
@@ -715,35 +715,35 @@
 				Name="Perl"
 				>
 				<File
-					RelativePath="..\..\aegisub\auto4_perl.cpp"
+					RelativePath="..\..\src\auto4_perl.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_perl.h"
+					RelativePath="..\..\src\auto4_perl.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_perl_ass.cpp"
+					RelativePath="..\..\src\auto4_perl_ass.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_perl_console.cpp"
+					RelativePath="..\..\src\auto4_perl_console.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_perl_console.h"
+					RelativePath="..\..\src\auto4_perl_console.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_perl_dialogs.cpp"
+					RelativePath="..\..\src\auto4_perl_dialogs.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_perl_script.cpp"
+					RelativePath="..\..\src\auto4_perl_script.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\aegisub\auto4_perldata.inc"
+					RelativePath="..\..\src\auto4_perldata.inc"
 					>
 				</File>
 			</Filter>
@@ -752,63 +752,63 @@
 			Name="Wrappers"
 			>
 			<File
-				RelativePath="..\..\aegisub\avisynth.h"
+				RelativePath="..\..\src\avisynth.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\avisynth_wrap.cpp"
+				RelativePath="..\..\src\avisynth_wrap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\avisynth_wrap.h"
+				RelativePath="..\..\src\avisynth_wrap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ffmpegsource_common.cpp"
+				RelativePath="..\..\src\ffmpegsource_common.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\ffmpegsource_common.h"
+				RelativePath="..\..\src\ffmpegsource_common.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\gl_text.cpp"
+				RelativePath="..\..\src\gl_text.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\gl_text.h"
+				RelativePath="..\..\src\gl_text.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\gl_wrap.cpp"
+				RelativePath="..\..\src\gl_wrap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\gl_wrap.h"
+				RelativePath="..\..\src\gl_wrap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\lavc_file.cpp"
+				RelativePath="..\..\src\lavc_file.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\lavc_file.h"
+				RelativePath="..\..\src\lavc_file.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\mkv_wrap.cpp"
+				RelativePath="..\..\src\mkv_wrap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\mkv_wrap.h"
+				RelativePath="..\..\src\mkv_wrap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\vfw_wrap.cpp"
+				RelativePath="..\..\src\vfw_wrap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\vfw_wrap.h"
+				RelativePath="..\..\src\vfw_wrap.h"
 				>
 			</File>
 		</Filter>
@@ -816,107 +816,107 @@
 			Name="Controls"
 			>
 			<File
-				RelativePath="..\..\aegisub\base_grid.cpp"
+				RelativePath="..\..\src\base_grid.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\base_grid.h"
+				RelativePath="..\..\src\base_grid.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\browse_button.cpp"
+				RelativePath="..\..\src\browse_button.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\browse_button.h"
+				RelativePath="..\..\src\browse_button.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\colour_button.cpp"
+				RelativePath="..\..\src\colour_button.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\colour_button.h"
+				RelativePath="..\..\src\colour_button.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\float_spin.cpp"
+				RelativePath="..\..\src\float_spin.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\float_spin.h"
+				RelativePath="..\..\src\float_spin.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\help_button.cpp"
+				RelativePath="..\..\src\help_button.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\help_button.h"
+				RelativePath="..\..\src\help_button.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\hilimod_textctrl.cpp"
+				RelativePath="..\..\src\hilimod_textctrl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\hilimod_textctrl.h"
+				RelativePath="..\..\src\hilimod_textctrl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\scintilla_text_ctrl.cpp"
+				RelativePath="..\..\src\scintilla_text_ctrl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\scintilla_text_ctrl.h"
+				RelativePath="..\..\src\scintilla_text_ctrl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\static_bmp.cpp"
+				RelativePath="..\..\src\static_bmp.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\static_bmp.h"
+				RelativePath="..\..\src\static_bmp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subs_edit_ctrl.cpp"
+				RelativePath="..\..\src\subs_edit_ctrl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subs_edit_ctrl.h"
+				RelativePath="..\..\src\subs_edit_ctrl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subs_grid.cpp"
+				RelativePath="..\..\src\subs_grid.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subs_grid.h"
+				RelativePath="..\..\src\subs_grid.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subs_preview.cpp"
+				RelativePath="..\..\src\subs_preview.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subs_preview.h"
+				RelativePath="..\..\src\subs_preview.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\timeedit_ctrl.cpp"
+				RelativePath="..\..\src\timeedit_ctrl.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\timeedit_ctrl.h"
+				RelativePath="..\..\src\timeedit_ctrl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\toggle_bitmap.cpp"
+				RelativePath="..\..\src\toggle_bitmap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\toggle_bitmap.h"
+				RelativePath="..\..\src\toggle_bitmap.h"
 				>
 			</File>
 		</Filter>
@@ -924,91 +924,91 @@
 			Name="Utilities"
 			>
 			<File
-				RelativePath="..\..\aegisub\aegisublocale.cpp"
+				RelativePath="..\..\src\aegisublocale.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\aegisublocale.h"
+				RelativePath="..\..\src\aegisublocale.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\charset_detect.cpp"
+				RelativePath="..\..\src\charset_detect.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\charset_detect.h"
+				RelativePath="..\..\src\charset_detect.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\colorspace.cpp"
+				RelativePath="..\..\src\colorspace.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\colorspace.h"
+				RelativePath="..\..\src\colorspace.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\drop.cpp"
+				RelativePath="..\..\src\drop.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\drop.h"
+				RelativePath="..\..\src\drop.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\factory_manager.h"
+				RelativePath="..\..\src\factory_manager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\fft.cpp"
+				RelativePath="..\..\src\fft.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\fft.h"
+				RelativePath="..\..\src\fft.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\font_file_lister.cpp"
+				RelativePath="..\..\src\font_file_lister.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\font_file_lister.h"
+				RelativePath="..\..\src\font_file_lister.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\font_file_lister_fontconfig.cpp"
+				RelativePath="..\..\src\font_file_lister_fontconfig.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\font_file_lister_fontconfig.h"
+				RelativePath="..\..\src\font_file_lister_fontconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\font_file_lister_freetype.cpp"
+				RelativePath="..\..\src\font_file_lister_freetype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\font_file_lister_freetype.h"
+				RelativePath="..\..\src\font_file_lister_freetype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\idle_field_event.cpp"
+				RelativePath="..\..\src\idle_field_event.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\idle_field_event.h"
+				RelativePath="..\..\src\idle_field_event.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\kana_table.cpp"
+				RelativePath="..\..\src\kana_table.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\kana_table.h"
+				RelativePath="..\..\src\kana_table.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\MatroskaParser.c"
+				RelativePath="..\..\src\MatroskaParser.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1044,11 +1044,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\MatroskaParser.h"
+				RelativePath="..\..\src\MatroskaParser.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\md5.c"
+				RelativePath="..\..\src\md5.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1084,119 +1084,119 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\md5.h"
+				RelativePath="..\..\src\md5.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\mythes.cxx"
+				RelativePath="..\..\src\mythes.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\mythes.hxx"
+				RelativePath="..\..\src\mythes.hxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\spline.cpp"
+				RelativePath="..\..\src\spline.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\spline.h"
+				RelativePath="..\..\src\spline.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\spline_curve.cpp"
+				RelativePath="..\..\src\spline_curve.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\spline_curve.h"
+				RelativePath="..\..\src\spline_curve.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\standard_paths.cpp"
+				RelativePath="..\..\src\standard_paths.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\standard_paths.h"
+				RelativePath="..\..\src\standard_paths.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\string_codec.cpp"
+				RelativePath="..\..\src\string_codec.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\string_codec.h"
+				RelativePath="..\..\src\string_codec.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\text_file_reader.cpp"
+				RelativePath="..\..\src\text_file_reader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\text_file_reader.h"
+				RelativePath="..\..\src\text_file_reader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\text_file_writer.cpp"
+				RelativePath="..\..\src\text_file_writer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\text_file_writer.h"
+				RelativePath="..\..\src\text_file_writer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\tooltip_manager.cpp"
+				RelativePath="..\..\src\tooltip_manager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\tooltip_manager.h"
+				RelativePath="..\..\src\tooltip_manager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\utils.cpp"
+				RelativePath="..\..\src\utils.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\utils.h"
+				RelativePath="..\..\src\utils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\validators.cpp"
+				RelativePath="..\..\src\validators.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\validators.h"
+				RelativePath="..\..\src\validators.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\variable_data.cpp"
+				RelativePath="..\..\src\variable_data.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\variable_data.h"
+				RelativePath="..\..\src\variable_data.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\vector2d.cpp"
+				RelativePath="..\..\src\vector2d.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\vector2d.h"
+				RelativePath="..\..\src\vector2d.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\vfr.cpp"
+				RelativePath="..\..\src\vfr.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\vfr.h"
+				RelativePath="..\..\src\vfr.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\VideoSink.cpp"
+				RelativePath="..\..\src\VideoSink.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\VideoSink.h"
+				RelativePath="..\..\src\VideoSink.h"
 				>
 			</File>
 		</Filter>
@@ -1204,243 +1204,243 @@
 			Name="Dialogs"
 			>
 			<File
-				RelativePath="..\..\aegisub\dialog_about.cpp"
+				RelativePath="..\..\src\dialog_about.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_about.h"
+				RelativePath="..\..\src\dialog_about.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_associations.cpp"
+				RelativePath="..\..\src\dialog_associations.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_associations.h"
+				RelativePath="..\..\src\dialog_associations.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_attachments.cpp"
+				RelativePath="..\..\src\dialog_attachments.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_attachments.h"
+				RelativePath="..\..\src\dialog_attachments.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_automation.cpp"
+				RelativePath="..\..\src\dialog_automation.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_automation.h"
+				RelativePath="..\..\src\dialog_automation.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_colorpicker.cpp"
+				RelativePath="..\..\src\dialog_colorpicker.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_colorpicker.h"
+				RelativePath="..\..\src\dialog_colorpicker.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_detached_video.cpp"
+				RelativePath="..\..\src\dialog_detached_video.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_detached_video.h"
+				RelativePath="..\..\src\dialog_detached_video.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_dummy_video.cpp"
+				RelativePath="..\..\src\dialog_dummy_video.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_dummy_video.h"
+				RelativePath="..\..\src\dialog_dummy_video.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_export.cpp"
+				RelativePath="..\..\src\dialog_export.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_export.h"
+				RelativePath="..\..\src\dialog_export.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_fonts_collector.cpp"
+				RelativePath="..\..\src\dialog_fonts_collector.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_fonts_collector.h"
+				RelativePath="..\..\src\dialog_fonts_collector.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_jumpto.cpp"
+				RelativePath="..\..\src\dialog_jumpto.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_jumpto.h"
+				RelativePath="..\..\src\dialog_jumpto.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_kanji_timer.cpp"
+				RelativePath="..\..\src\dialog_kanji_timer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_kanji_timer.h"
+				RelativePath="..\..\src\dialog_kanji_timer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_options.cpp"
+				RelativePath="..\..\src\dialog_options.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_options.h"
+				RelativePath="..\..\src\dialog_options.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_paste_over.cpp"
+				RelativePath="..\..\src\dialog_paste_over.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_paste_over.h"
+				RelativePath="..\..\src\dialog_paste_over.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_progress.cpp"
+				RelativePath="..\..\src\dialog_progress.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_progress.h"
+				RelativePath="..\..\src\dialog_progress.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_properties.cpp"
+				RelativePath="..\..\src\dialog_properties.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_properties.h"
+				RelativePath="..\..\src\dialog_properties.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_resample.cpp"
+				RelativePath="..\..\src\dialog_resample.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_resample.h"
+				RelativePath="..\..\src\dialog_resample.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_search_replace.cpp"
+				RelativePath="..\..\src\dialog_search_replace.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_search_replace.h"
+				RelativePath="..\..\src\dialog_search_replace.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_selection.cpp"
+				RelativePath="..\..\src\dialog_selection.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_selection.h"
+				RelativePath="..\..\src\dialog_selection.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_shift_times.cpp"
+				RelativePath="..\..\src\dialog_shift_times.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_shift_times.h"
+				RelativePath="..\..\src\dialog_shift_times.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_spellchecker.cpp"
+				RelativePath="..\..\src\dialog_spellchecker.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_spellchecker.h"
+				RelativePath="..\..\src\dialog_spellchecker.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_splash.cpp"
+				RelativePath="..\..\src\dialog_splash.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_splash.h"
+				RelativePath="..\..\src\dialog_splash.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_style_editor.cpp"
+				RelativePath="..\..\src\dialog_style_editor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_style_editor.h"
+				RelativePath="..\..\src\dialog_style_editor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_style_manager.cpp"
+				RelativePath="..\..\src\dialog_style_manager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_style_manager.h"
+				RelativePath="..\..\src\dialog_style_manager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_styling_assistant.cpp"
+				RelativePath="..\..\src\dialog_styling_assistant.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_styling_assistant.h"
+				RelativePath="..\..\src\dialog_styling_assistant.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_text_import.cpp"
+				RelativePath="..\..\src\dialog_text_import.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_text_import.h"
+				RelativePath="..\..\src\dialog_text_import.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_timing_processor.cpp"
+				RelativePath="..\..\src\dialog_timing_processor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_timing_processor.h"
+				RelativePath="..\..\src\dialog_timing_processor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_tip.cpp"
+				RelativePath="..\..\src\dialog_tip.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_tip.h"
+				RelativePath="..\..\src\dialog_tip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_translation.cpp"
+				RelativePath="..\..\src\dialog_translation.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_translation.h"
+				RelativePath="..\..\src\dialog_translation.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_version_check.cpp"
+				RelativePath="..\..\src\dialog_version_check.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_version_check.h"
+				RelativePath="..\..\src\dialog_version_check.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_video_details.cpp"
+				RelativePath="..\..\src\dialog_video_details.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\dialog_video_details.h"
+				RelativePath="..\..\src\dialog_video_details.h"
 				>
 			</File>
 		</Filter>
@@ -1448,55 +1448,55 @@
 			Name="Core"
 			>
 			<File
-				RelativePath="..\..\aegisub\frame_main.cpp"
+				RelativePath="..\..\src\frame_main.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\frame_main.h"
+				RelativePath="..\..\src\frame_main.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\frame_main_events.cpp"
+				RelativePath="..\..\src\frame_main_events.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\hotkeys.cpp"
+				RelativePath="..\..\src\hotkeys.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\hotkeys.h"
+				RelativePath="..\..\src\hotkeys.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\main.cpp"
+				RelativePath="..\..\src\main.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\main.h"
+				RelativePath="..\..\src\main.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\options.cpp"
+				RelativePath="..\..\src\options.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\options.h"
+				RelativePath="..\..\src\options.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\plugin_manager.cpp"
+				RelativePath="..\..\src\plugin_manager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\plugin_manager.h"
+				RelativePath="..\..\src\plugin_manager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\setup.cpp"
+				RelativePath="..\..\src\setup.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\stdwx.cpp"
+				RelativePath="..\..\src\stdwx.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1532,23 +1532,23 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\stdwx.h"
+				RelativePath="..\..\src\stdwx.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subs_edit_box.cpp"
+				RelativePath="..\..\src\subs_edit_box.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subs_edit_box.h"
+				RelativePath="..\..\src\subs_edit_box.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\version.cpp"
+				RelativePath="..\..\src\version.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\version.h"
+				RelativePath="..\..\src\version.h"
 				>
 			</File>
 		</Filter>
@@ -1556,35 +1556,35 @@
 			Name="Export"
 			>
 			<File
-				RelativePath="..\..\aegisub\export_clean_info.cpp"
+				RelativePath="..\..\src\export_clean_info.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\export_clean_info.h"
+				RelativePath="..\..\src\export_clean_info.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\export_fixstyle.cpp"
+				RelativePath="..\..\src\export_fixstyle.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\export_fixstyle.h"
+				RelativePath="..\..\src\export_fixstyle.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\export_framerate.cpp"
+				RelativePath="..\..\src\export_framerate.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\export_framerate.h"
+				RelativePath="..\..\src\export_framerate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\export_visible_lines.cpp"
+				RelativePath="..\..\src\export_visible_lines.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\export_visible_lines.h"
+				RelativePath="..\..\src\export_visible_lines.h"
 				>
 			</File>
 		</Filter>
@@ -1592,115 +1592,115 @@
 			Name="Video"
 			>
 			<File
-				RelativePath="..\..\aegisub\keyframe.cpp"
+				RelativePath="..\..\src\keyframe.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\keyframe.h"
+				RelativePath="..\..\src\keyframe.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\lavc_keyframes.cpp"
+				RelativePath="..\..\src\lavc_keyframes.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\lavc_keyframes.h"
+				RelativePath="..\..\src\lavc_keyframes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_box.cpp"
+				RelativePath="..\..\src\video_box.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_box.h"
+				RelativePath="..\..\src\video_box.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_context.cpp"
+				RelativePath="..\..\src\video_context.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_context.h"
+				RelativePath="..\..\src\video_context.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_display.cpp"
+				RelativePath="..\..\src\video_display.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_display.h"
+				RelativePath="..\..\src\video_display.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_frame.cpp"
+				RelativePath="..\..\src\video_frame.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_frame.h"
+				RelativePath="..\..\src\video_frame.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_avs.cpp"
+				RelativePath="..\..\src\video_provider_avs.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_avs.h"
+				RelativePath="..\..\src\video_provider_avs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_cache.cpp"
+				RelativePath="..\..\src\video_provider_cache.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_cache.h"
+				RelativePath="..\..\src\video_provider_cache.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_dshow.cpp"
+				RelativePath="..\..\src\video_provider_dshow.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_dshow.h"
+				RelativePath="..\..\src\video_provider_dshow.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_dummy.cpp"
+				RelativePath="..\..\src\video_provider_dummy.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_dummy.h"
+				RelativePath="..\..\src\video_provider_dummy.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_ffmpegsource.cpp"
+				RelativePath="..\..\src\video_provider_ffmpegsource.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_ffmpegsource.h"
+				RelativePath="..\..\src\video_provider_ffmpegsource.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_lavc.cpp"
+				RelativePath="..\..\src\video_provider_lavc.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_lavc.h"
+				RelativePath="..\..\src\video_provider_lavc.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_manager.cpp"
+				RelativePath="..\..\src\video_provider_manager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_provider_manager.h"
+				RelativePath="..\..\src\video_provider_manager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_slider.cpp"
+				RelativePath="..\..\src\video_slider.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\video_slider.h"
+				RelativePath="..\..\src\video_slider.h"
 				>
 			</File>
 		</Filter>
@@ -1708,35 +1708,35 @@
 			Name="Spellchecking"
 			>
 			<File
-				RelativePath="..\..\aegisub\spellchecker.cpp"
+				RelativePath="..\..\src\spellchecker.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\spellchecker_hunspell.cpp"
+				RelativePath="..\..\src\spellchecker_hunspell.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\spellchecker_hunspell.h"
+				RelativePath="..\..\src\spellchecker_hunspell.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\spellchecker_manager.h"
+				RelativePath="..\..\src\spellchecker_manager.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\thesaurus.cpp"
+				RelativePath="..\..\src\thesaurus.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\thesaurus.h"
+				RelativePath="..\..\src\thesaurus.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\thesaurus_myspell.cpp"
+				RelativePath="..\..\src\thesaurus_myspell.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\thesaurus_myspell.h"
+				RelativePath="..\..\src\thesaurus_myspell.h"
 				>
 			</File>
 		</Filter>
@@ -1744,91 +1744,91 @@
 			Name="Subtitle Formats"
 			>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format.cpp"
+				RelativePath="..\..\src\subtitle_format.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format.h"
+				RelativePath="..\..\src\subtitle_format.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_ass.cpp"
+				RelativePath="..\..\src\subtitle_format_ass.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_ass.h"
+				RelativePath="..\..\src\subtitle_format_ass.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_dvd.cpp"
+				RelativePath="..\..\src\subtitle_format_dvd.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_dvd.h"
+				RelativePath="..\..\src\subtitle_format_dvd.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_encore.cpp"
+				RelativePath="..\..\src\subtitle_format_encore.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_encore.h"
+				RelativePath="..\..\src\subtitle_format_encore.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_microdvd.cpp"
+				RelativePath="..\..\src\subtitle_format_microdvd.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_microdvd.h"
+				RelativePath="..\..\src\subtitle_format_microdvd.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_mkv.cpp"
+				RelativePath="..\..\src\subtitle_format_mkv.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_mkv.h"
+				RelativePath="..\..\src\subtitle_format_mkv.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_prs.cpp"
+				RelativePath="..\..\src\subtitle_format_prs.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_prs.h"
+				RelativePath="..\..\src\subtitle_format_prs.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_srt.cpp"
+				RelativePath="..\..\src\subtitle_format_srt.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_srt.h"
+				RelativePath="..\..\src\subtitle_format_srt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_transtation.cpp"
+				RelativePath="..\..\src\subtitle_format_transtation.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_transtation.h"
+				RelativePath="..\..\src\subtitle_format_transtation.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_ttxt.cpp"
+				RelativePath="..\..\src\subtitle_format_ttxt.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_ttxt.h"
+				RelativePath="..\..\src\subtitle_format_ttxt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_txt.cpp"
+				RelativePath="..\..\src\subtitle_format_txt.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitle_format_txt.h"
+				RelativePath="..\..\src\subtitle_format_txt.h"
 				>
 			</File>
 		</Filter>
@@ -1836,27 +1836,27 @@
 			Name="Subtitle Providers"
 			>
 			<File
-				RelativePath="..\..\aegisub\subtitles_provider.cpp"
+				RelativePath="..\..\src\subtitles_provider.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitles_provider_csri.cpp"
+				RelativePath="..\..\src\subtitles_provider_csri.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitles_provider_csri.h"
+				RelativePath="..\..\src\subtitles_provider_csri.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitles_provider_libass.cpp"
+				RelativePath="..\..\src\subtitles_provider_libass.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitles_provider_libass.h"
+				RelativePath="..\..\src\subtitles_provider_libass.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\subtitles_provider_manager.h"
+				RelativePath="..\..\src\subtitles_provider_manager.h"
 				>
 			</File>
 		</Filter>
@@ -1864,75 +1864,75 @@
 			Name="Visual Tools"
 			>
 			<File
-				RelativePath="..\..\aegisub\visual_feature.cpp"
+				RelativePath="..\..\src\visual_feature.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_feature.h"
+				RelativePath="..\..\src\visual_feature.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool.cpp"
+				RelativePath="..\..\src\visual_tool.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool.h"
+				RelativePath="..\..\src\visual_tool.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_clip.cpp"
+				RelativePath="..\..\src\visual_tool_clip.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_clip.h"
+				RelativePath="..\..\src\visual_tool_clip.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_cross.cpp"
+				RelativePath="..\..\src\visual_tool_cross.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_cross.h"
+				RelativePath="..\..\src\visual_tool_cross.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_drag.cpp"
+				RelativePath="..\..\src\visual_tool_drag.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_drag.h"
+				RelativePath="..\..\src\visual_tool_drag.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_rotatexy.cpp"
+				RelativePath="..\..\src\visual_tool_rotatexy.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_rotatexy.h"
+				RelativePath="..\..\src\visual_tool_rotatexy.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_rotatez.cpp"
+				RelativePath="..\..\src\visual_tool_rotatez.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_rotatez.h"
+				RelativePath="..\..\src\visual_tool_rotatez.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_scale.cpp"
+				RelativePath="..\..\src\visual_tool_scale.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_scale.h"
+				RelativePath="..\..\src\visual_tool_scale.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_vector_clip.cpp"
+				RelativePath="..\..\src\visual_tool_vector_clip.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\visual_tool_vector_clip.h"
+				RelativePath="..\..\src\visual_tool_vector_clip.h"
 				>
 			</File>
 		</Filter>
@@ -1940,15 +1940,15 @@
 			Name="Config"
 			>
 			<File
-				RelativePath="..\..\aegisub\config\config_unix.h"
+				RelativePath="..\..\src\config\config_unix.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\config\config_windows.h"
+				RelativePath="..\..\src\config\config_windows.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\config\config_windows0.h"
+				RelativePath="..\..\src\config\config_windows0.h"
 				>
 			</File>
 		</Filter>
@@ -1956,36 +1956,36 @@
 			Name="Include"
 			>
 			<File
-				RelativePath="..\..\aegisub\include\aegisub\aegisub.h"
+				RelativePath="..\..\src\include\aegisub\aegisub.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\include\aegisub\audio_player.h"
+				RelativePath="..\..\src\include\aegisub\audio_player.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\include\aegisub\audio_provider.h"
+				RelativePath="..\..\src\include\aegisub\audio_provider.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\include\aegisub\spellchecker.h"
+				RelativePath="..\..\src\include\aegisub\spellchecker.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\include\aegisub\subtitles_provider.h"
+				RelativePath="..\..\src\include\aegisub\subtitles_provider.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\aegisub\include\aegisub\video_provider.h"
+				RelativePath="..\..\src\include\aegisub\video_provider.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\aegisub\changelog.txt"
+			RelativePath="..\..\src\changelog.txt"
 			>
 		</File>
 		<File
-			RelativePath="..\..\aegisub\res.rc"
+			RelativePath="..\..\src\res.rc"
 			>
 		</File>
 	</Files>