diff --git a/aegisub/Makefile b/aegisub/Makefile
index 70641beb5..8683ae44b 100644
--- a/aegisub/Makefile
+++ b/aegisub/Makefile
@@ -1,7 +1,7 @@
 include Makefile.inc
 
 SUBDIRS += \
-	universalchardet \
+	vendor/universalchardet \
 	libaegisub \
 	tools \
 	src \
diff --git a/aegisub/Makefile.inc.in b/aegisub/Makefile.inc.in
index c19630f83..87eb5469b 100644
--- a/aegisub/Makefile.inc.in
+++ b/aegisub/Makefile.inc.in
@@ -91,7 +91,7 @@ CFLAGS_OSS         = @OSS_CFLAGS@
 CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
 CFLAGS_PTHREAD     = @PTHREAD_CFLAGS@
 CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
-CFLAGS_UCHARDET    = -I../universalchardet
+CFLAGS_UCHARDET    = -I../vendor/universalchardet
 
 LIBS_ALSA          = @ALSA_LIBS@
 LIBS_FFMS2         = @FFMS2_LIBS@
@@ -109,7 +109,7 @@ LIBS_LUA           = @LUA_LIBS@
 LIBS_OPENAL        = @OPENAL_LIBS@
 LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
 LIBS_PTHREAD       = @PTHREAD_LIBS@
-LIBS_UCHARDET     ?= ../universalchardet/libuniversalchardet.a
+LIBS_UCHARDET     ?= ../vendor/universalchardet/libuniversalchardet.a
 
 #####################
 # DEBUG / DEVELOPMENT
diff --git a/aegisub/Makefile.target b/aegisub/Makefile.target
index 42d4fe6ea..daa8ea6c6 100644
--- a/aegisub/Makefile.target
+++ b/aegisub/Makefile.target
@@ -140,7 +140,7 @@ $(SUBDIRS):
 
 # Set relations to ensure dependencies are built before their targets during parallel builds.
 automation: libaegisub
-src: universalchardet tools libaegisub
+src: vendor/universalchardet tools libaegisub
 tests: libaegisub
 tools: libaegisub
 reporter: src
diff --git a/aegisub/build/csrihelper/csrihelper.vcxproj b/aegisub/build/csrihelper/csrihelper.vcxproj
index d4e4f1ecd..93fb6a037 100644
--- a/aegisub/build/csrihelper/csrihelper.vcxproj
+++ b/aegisub/build/csrihelper/csrihelper.vcxproj
@@ -8,7 +8,7 @@
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-    <SrcDir>..\..\..\contrib\csri\</SrcDir>
+    <SrcDir>..\..\vendor\csri\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
diff --git a/aegisub/build/hunspell/hunspell.vcxproj b/aegisub/build/hunspell/hunspell.vcxproj
index d52d51a7f..e935f25c8 100644
--- a/aegisub/build/hunspell/hunspell.vcxproj
+++ b/aegisub/build/hunspell/hunspell.vcxproj
@@ -7,7 +7,7 @@
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-    <SrcDir>..\..\..\contrib\hunspell\src\</SrcDir>
+    <SrcDir>..\..\vendor\hunspell\src\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
@@ -47,9 +47,12 @@
     <ClCompile Include="$(SrcDir)hunspell\affixmgr.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\csutil.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\dictmgr.cxx" />
+    <ClCompile Include="$(SrcDir)hunspell\filemgr.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\hashmgr.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\hunspell.cxx" />
+    <ClCompile Include="$(SrcDir)hunspell\hunzip.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\phonet.cxx" />
+    <ClCompile Include="$(SrcDir)hunspell\replist.cxx" />
     <ClCompile Include="$(SrcDir)hunspell\suggestmgr.cxx" />
     <ClCompile Include="$(SrcDir)parsers\firstparser.cxx" />
     <ClCompile Include="$(SrcDir)parsers\htmlparser.cxx" />
@@ -61,8 +64,5 @@
       <!-- Why is this file named .c when it's obviously C++ code -->
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\filemgr.cxx" />
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\hunzip.cxx" />
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\replist.cxx" />
   </ItemGroup>
 </Project>
diff --git a/aegisub/build/hunspell/hunspell.vcxproj.filters b/aegisub/build/hunspell/hunspell.vcxproj.filters
index 06e68e252..8a3be6726 100644
--- a/aegisub/build/hunspell/hunspell.vcxproj.filters
+++ b/aegisub/build/hunspell/hunspell.vcxproj.filters
@@ -122,14 +122,14 @@
     <ClCompile Include="$(SrcDir)win_api\hunspelldll.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\filemgr.cxx">
+    <ClCompile Include="$(SrcDir)hunspell\filemgr.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\hunzip.cxx">
+    <ClCompile Include="$(SrcDir)hunspell\hunzip.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\contrib\hunspell\src\hunspell\replist.cxx">
+    <ClCompile Include="$(SrcDir)hunspell\replist.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/aegisub/build/libiconv/libiconv.vcxproj b/aegisub/build/libiconv/libiconv.vcxproj
index ffbcc9898..c86b91668 100644
--- a/aegisub/build/libiconv/libiconv.vcxproj
+++ b/aegisub/build/libiconv/libiconv.vcxproj
@@ -7,7 +7,7 @@
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-    <SrcDir>..\..\..\contrib\iconv\</SrcDir>
+    <SrcDir>..\..\vendor\iconv\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
diff --git a/aegisub/build/paths.props b/aegisub/build/paths.props
index 7a9a9432f..03e2461c8 100644
--- a/aegisub/build/paths.props
+++ b/aegisub/build/paths.props
@@ -8,7 +8,7 @@
 		<!-- Base for Aegisub source code -->
 		<AegisubSourceBase Condition="'$(AegisubSourceBase)'==''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</AegisubSourceBase>
 		<!-- Base for contrib libraries source code -->
-		<AegisubContribBase Condition="'$(AegisubContribBase)'==''">$(AegisubSourceBase)..\contrib\</AegisubContribBase>
+		<AegisubContribBase Condition="'$(AegisubContribBase)'==''">$(AegisubSourceBase)vendor\</AegisubContribBase>
 		<!-- Base for built files -->
 		<AegisubOutputBase Condition="'$(AegisubOutputBase)'==''">$(AegisubSourceBase)</AegisubOutputBase>
 		<!-- Directory for built executables -->
diff --git a/aegisub/build/universalchardet/universalchardet.vcxproj b/aegisub/build/universalchardet/universalchardet.vcxproj
index e5a182875..e4212662e 100644
--- a/aegisub/build/universalchardet/universalchardet.vcxproj
+++ b/aegisub/build/universalchardet/universalchardet.vcxproj
@@ -7,7 +7,7 @@
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-    <SrcDir>..\..\universalchardet\</SrcDir>
+    <SrcDir>..\..\vendor\universalchardet\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
diff --git a/aegisub/libaegisub/common/charset.cpp b/aegisub/libaegisub/common/charset.cpp
index 1b39b52f9..c92293e1c 100644
--- a/aegisub/libaegisub/common/charset.cpp
+++ b/aegisub/libaegisub/common/charset.cpp
@@ -27,10 +27,10 @@
 #define _X86_ 1
 #endif
 
-#include "../../universalchardet/nscore.h"
-#include "../../universalchardet/nsUniversalDetector.h"
-#include "../../universalchardet/nsMBCSGroupProber.h"
-#include "../../universalchardet/nsCharSetProber.h"
+#include "../../vendor/universalchardet/nscore.h"
+#include "../../vendor/universalchardet/nsUniversalDetector.h"
+#include "../../vendor/universalchardet/nsMBCSGroupProber.h"
+#include "../../vendor/universalchardet/nsCharSetProber.h"
 
 namespace {
 using namespace agi::charset;
diff --git a/aegisub/tests/Makefile b/aegisub/tests/Makefile
index c986ad797..0f429da23 100644
--- a/aegisub/tests/Makefile
+++ b/aegisub/tests/Makefile
@@ -3,7 +3,7 @@ include ../Makefile.inc
 
 PROGRAM = run
 
-LIBS += -L../libaegisub -laegisub -L../universalchardet -luniversalchardet $(LIBS_BOOST) $(LIBS_ICU)
+LIBS += -L../libaegisub -laegisub -L../vendor/universalchardet -luniversalchardet $(LIBS_BOOST) $(LIBS_ICU)
 LDFLAGS += -Wl,-rpath $(CURDIR)/../libaegisub $(LDFLAGS_ICONV)
 
 CPPFLAGS += -I../src/include -I../libaegisub/include $(CFLAGS_ICONV) -I${GTEST_ROOT} -I${GTEST_ROOT}/include -I./support $(CPPFLAGS_BOOST)
diff --git a/contrib/csri/Doxyfile b/aegisub/vendor/csri/Doxyfile
similarity index 100%
rename from contrib/csri/Doxyfile
rename to aegisub/vendor/csri/Doxyfile
diff --git a/contrib/csri/LICENSE b/aegisub/vendor/csri/LICENSE
similarity index 100%
rename from contrib/csri/LICENSE
rename to aegisub/vendor/csri/LICENSE
diff --git a/contrib/csri/Makefile.am b/aegisub/vendor/csri/Makefile.am
similarity index 100%
rename from contrib/csri/Makefile.am
rename to aegisub/vendor/csri/Makefile.am
diff --git a/contrib/csri/ac/Makefile.am b/aegisub/vendor/csri/ac/Makefile.am
similarity index 100%
rename from contrib/csri/ac/Makefile.am
rename to aegisub/vendor/csri/ac/Makefile.am
diff --git a/contrib/csri/acinclude.m4 b/aegisub/vendor/csri/acinclude.m4
similarity index 100%
rename from contrib/csri/acinclude.m4
rename to aegisub/vendor/csri/acinclude.m4
diff --git a/contrib/csri/backends/Makefile.am b/aegisub/vendor/csri/backends/Makefile.am
similarity index 100%
rename from contrib/csri/backends/Makefile.am
rename to aegisub/vendor/csri/backends/Makefile.am
diff --git a/contrib/csri/backends/libass/Makefile.am b/aegisub/vendor/csri/backends/libass/Makefile.am
similarity index 100%
rename from contrib/csri/backends/libass/Makefile.am
rename to aegisub/vendor/csri/backends/libass/Makefile.am
diff --git a/contrib/csri/backends/libass/libass_csri.c b/aegisub/vendor/csri/backends/libass/libass_csri.c
similarity index 100%
rename from contrib/csri/backends/libass/libass_csri.c
rename to aegisub/vendor/csri/backends/libass/libass_csri.c
diff --git a/contrib/csri/bootstrap b/aegisub/vendor/csri/bootstrap
similarity index 100%
rename from contrib/csri/bootstrap
rename to aegisub/vendor/csri/bootstrap
diff --git a/contrib/csri/configure.ac b/aegisub/vendor/csri/configure.ac
similarity index 100%
rename from contrib/csri/configure.ac
rename to aegisub/vendor/csri/configure.ac
diff --git a/contrib/csri/csri.pc.in b/aegisub/vendor/csri/csri.pc.in
similarity index 100%
rename from contrib/csri/csri.pc.in
rename to aegisub/vendor/csri/csri.pc.in
diff --git a/contrib/csri/csri_2008.vcproj b/aegisub/vendor/csri/csri_2008.vcproj
similarity index 100%
rename from contrib/csri/csri_2008.vcproj
rename to aegisub/vendor/csri/csri_2008.vcproj
diff --git a/contrib/csri/frontends/Makefile.am b/aegisub/vendor/csri/frontends/Makefile.am
similarity index 100%
rename from contrib/csri/frontends/Makefile.am
rename to aegisub/vendor/csri/frontends/Makefile.am
diff --git a/contrib/csri/frontends/avisynth25/Makefile.am b/aegisub/vendor/csri/frontends/avisynth25/Makefile.am
similarity index 100%
rename from contrib/csri/frontends/avisynth25/Makefile.am
rename to aegisub/vendor/csri/frontends/avisynth25/Makefile.am
diff --git a/contrib/csri/frontends/avisynth25/avisynth.cpp b/aegisub/vendor/csri/frontends/avisynth25/avisynth.cpp
similarity index 100%
rename from contrib/csri/frontends/avisynth25/avisynth.cpp
rename to aegisub/vendor/csri/frontends/avisynth25/avisynth.cpp
diff --git a/contrib/csri/frontends/avisynth25/avisynth.h b/aegisub/vendor/csri/frontends/avisynth25/avisynth.h
similarity index 100%
rename from contrib/csri/frontends/avisynth25/avisynth.h
rename to aegisub/vendor/csri/frontends/avisynth25/avisynth.h
diff --git a/contrib/csri/frontends/cmdline/Makefile.am b/aegisub/vendor/csri/frontends/cmdline/Makefile.am
similarity index 100%
rename from contrib/csri/frontends/cmdline/Makefile.am
rename to aegisub/vendor/csri/frontends/cmdline/Makefile.am
diff --git a/contrib/csri/frontends/cmdline/cmdmain.c b/aegisub/vendor/csri/frontends/cmdline/cmdmain.c
similarity index 100%
rename from contrib/csri/frontends/cmdline/cmdmain.c
rename to aegisub/vendor/csri/frontends/cmdline/cmdmain.c
diff --git a/contrib/csri/frontends/cmdline/render.c b/aegisub/vendor/csri/frontends/cmdline/render.c
similarity index 100%
rename from contrib/csri/frontends/cmdline/render.c
rename to aegisub/vendor/csri/frontends/cmdline/render.c
diff --git a/contrib/csri/frontends/cmdline/render.h b/aegisub/vendor/csri/frontends/cmdline/render.h
similarity index 100%
rename from contrib/csri/frontends/cmdline/render.h
rename to aegisub/vendor/csri/frontends/cmdline/render.h
diff --git a/contrib/csri/include/Makefile.am b/aegisub/vendor/csri/include/Makefile.am
similarity index 100%
rename from contrib/csri/include/Makefile.am
rename to aegisub/vendor/csri/include/Makefile.am
diff --git a/contrib/csri/include/csri/csri.h b/aegisub/vendor/csri/include/csri/csri.h
similarity index 100%
rename from contrib/csri/include/csri/csri.h
rename to aegisub/vendor/csri/include/csri/csri.h
diff --git a/contrib/csri/include/csri/fmtids.h b/aegisub/vendor/csri/include/csri/fmtids.h
similarity index 100%
rename from contrib/csri/include/csri/fmtids.h
rename to aegisub/vendor/csri/include/csri/fmtids.h
diff --git a/contrib/csri/include/csri/logging.h b/aegisub/vendor/csri/include/csri/logging.h
similarity index 100%
rename from contrib/csri/include/csri/logging.h
rename to aegisub/vendor/csri/include/csri/logging.h
diff --git a/contrib/csri/include/csri/openerr.h b/aegisub/vendor/csri/include/csri/openerr.h
similarity index 100%
rename from contrib/csri/include/csri/openerr.h
rename to aegisub/vendor/csri/include/csri/openerr.h
diff --git a/contrib/csri/include/csri/stream.h b/aegisub/vendor/csri/include/csri/stream.h
similarity index 100%
rename from contrib/csri/include/csri/stream.h
rename to aegisub/vendor/csri/include/csri/stream.h
diff --git a/contrib/csri/include/subhelp.h b/aegisub/vendor/csri/include/subhelp.h
similarity index 100%
rename from contrib/csri/include/subhelp.h
rename to aegisub/vendor/csri/include/subhelp.h
diff --git a/contrib/csri/include/visibility.h b/aegisub/vendor/csri/include/visibility.h
similarity index 100%
rename from contrib/csri/include/visibility.h
rename to aegisub/vendor/csri/include/visibility.h
diff --git a/contrib/csri/lib/Makefile.am b/aegisub/vendor/csri/lib/Makefile.am
similarity index 100%
rename from contrib/csri/lib/Makefile.am
rename to aegisub/vendor/csri/lib/Makefile.am
diff --git a/contrib/csri/lib/csrilib.h b/aegisub/vendor/csri/lib/csrilib.h
similarity index 100%
rename from contrib/csri/lib/csrilib.h
rename to aegisub/vendor/csri/lib/csrilib.h
diff --git a/contrib/csri/lib/list.c b/aegisub/vendor/csri/lib/list.c
similarity index 100%
rename from contrib/csri/lib/list.c
rename to aegisub/vendor/csri/lib/list.c
diff --git a/contrib/csri/lib/posix/csrilib_os.h b/aegisub/vendor/csri/lib/posix/csrilib_os.h
similarity index 100%
rename from contrib/csri/lib/posix/csrilib_os.h
rename to aegisub/vendor/csri/lib/posix/csrilib_os.h
diff --git a/contrib/csri/lib/posix/enumerate.c b/aegisub/vendor/csri/lib/posix/enumerate.c
similarity index 100%
rename from contrib/csri/lib/posix/enumerate.c
rename to aegisub/vendor/csri/lib/posix/enumerate.c
diff --git a/contrib/csri/lib/win32/csrilib_os.h b/aegisub/vendor/csri/lib/win32/csrilib_os.h
similarity index 100%
rename from contrib/csri/lib/win32/csrilib_os.h
rename to aegisub/vendor/csri/lib/win32/csrilib_os.h
diff --git a/contrib/csri/lib/win32/enumerate.c b/aegisub/vendor/csri/lib/win32/enumerate.c
similarity index 100%
rename from contrib/csri/lib/win32/enumerate.c
rename to aegisub/vendor/csri/lib/win32/enumerate.c
diff --git a/contrib/csri/lib/wrap.c b/aegisub/vendor/csri/lib/wrap.c
similarity index 100%
rename from contrib/csri/lib/wrap.c
rename to aegisub/vendor/csri/lib/wrap.c
diff --git a/contrib/csri/subhelp/Makefile.am b/aegisub/vendor/csri/subhelp/Makefile.am
similarity index 100%
rename from contrib/csri/subhelp/Makefile.am
rename to aegisub/vendor/csri/subhelp/Makefile.am
diff --git a/contrib/csri/subhelp/logging.c b/aegisub/vendor/csri/subhelp/logging.c
similarity index 100%
rename from contrib/csri/subhelp/logging.c
rename to aegisub/vendor/csri/subhelp/logging.c
diff --git a/contrib/csri/subhelp/posix/openfile.c b/aegisub/vendor/csri/subhelp/posix/openfile.c
similarity index 100%
rename from contrib/csri/subhelp/posix/openfile.c
rename to aegisub/vendor/csri/subhelp/posix/openfile.c
diff --git a/contrib/csri/subhelp/win32/openfile.c b/aegisub/vendor/csri/subhelp/win32/openfile.c
similarity index 100%
rename from contrib/csri/subhelp/win32/openfile.c
rename to aegisub/vendor/csri/subhelp/win32/openfile.c
diff --git a/contrib/hunspell/ABOUT-NLS b/aegisub/vendor/hunspell/ABOUT-NLS
similarity index 100%
rename from contrib/hunspell/ABOUT-NLS
rename to aegisub/vendor/hunspell/ABOUT-NLS
diff --git a/contrib/hunspell/AUTHORS b/aegisub/vendor/hunspell/AUTHORS
similarity index 100%
rename from contrib/hunspell/AUTHORS
rename to aegisub/vendor/hunspell/AUTHORS
diff --git a/contrib/hunspell/AUTHORS.myspell b/aegisub/vendor/hunspell/AUTHORS.myspell
similarity index 100%
rename from contrib/hunspell/AUTHORS.myspell
rename to aegisub/vendor/hunspell/AUTHORS.myspell
diff --git a/contrib/hunspell/BUGS b/aegisub/vendor/hunspell/BUGS
similarity index 100%
rename from contrib/hunspell/BUGS
rename to aegisub/vendor/hunspell/BUGS
diff --git a/contrib/hunspell/COPYING b/aegisub/vendor/hunspell/COPYING
similarity index 100%
rename from contrib/hunspell/COPYING
rename to aegisub/vendor/hunspell/COPYING
diff --git a/contrib/hunspell/COPYING.LGPL b/aegisub/vendor/hunspell/COPYING.LGPL
similarity index 100%
rename from contrib/hunspell/COPYING.LGPL
rename to aegisub/vendor/hunspell/COPYING.LGPL
diff --git a/contrib/hunspell/COPYING.MPL b/aegisub/vendor/hunspell/COPYING.MPL
similarity index 100%
rename from contrib/hunspell/COPYING.MPL
rename to aegisub/vendor/hunspell/COPYING.MPL
diff --git a/contrib/hunspell/ChangeLog b/aegisub/vendor/hunspell/ChangeLog
similarity index 100%
rename from contrib/hunspell/ChangeLog
rename to aegisub/vendor/hunspell/ChangeLog
diff --git a/contrib/hunspell/ChangeLog.O b/aegisub/vendor/hunspell/ChangeLog.O
similarity index 100%
rename from contrib/hunspell/ChangeLog.O
rename to aegisub/vendor/hunspell/ChangeLog.O
diff --git a/contrib/hunspell/INSTALL b/aegisub/vendor/hunspell/INSTALL
similarity index 100%
rename from contrib/hunspell/INSTALL
rename to aegisub/vendor/hunspell/INSTALL
diff --git a/contrib/hunspell/NEWS b/aegisub/vendor/hunspell/NEWS
similarity index 100%
rename from contrib/hunspell/NEWS
rename to aegisub/vendor/hunspell/NEWS
diff --git a/contrib/hunspell/README b/aegisub/vendor/hunspell/README
similarity index 100%
rename from contrib/hunspell/README
rename to aegisub/vendor/hunspell/README
diff --git a/contrib/hunspell/README.myspell b/aegisub/vendor/hunspell/README.myspell
similarity index 100%
rename from contrib/hunspell/README.myspell
rename to aegisub/vendor/hunspell/README.myspell
diff --git a/contrib/hunspell/THANKS b/aegisub/vendor/hunspell/THANKS
similarity index 100%
rename from contrib/hunspell/THANKS
rename to aegisub/vendor/hunspell/THANKS
diff --git a/contrib/hunspell/TODO b/aegisub/vendor/hunspell/TODO
similarity index 100%
rename from contrib/hunspell/TODO
rename to aegisub/vendor/hunspell/TODO
diff --git a/contrib/hunspell/license.hunspell b/aegisub/vendor/hunspell/license.hunspell
similarity index 100%
rename from contrib/hunspell/license.hunspell
rename to aegisub/vendor/hunspell/license.hunspell
diff --git a/contrib/hunspell/license.myspell b/aegisub/vendor/hunspell/license.myspell
similarity index 100%
rename from contrib/hunspell/license.myspell
rename to aegisub/vendor/hunspell/license.myspell
diff --git a/contrib/hunspell/src/hunspell/README b/aegisub/vendor/hunspell/src/hunspell/README
similarity index 100%
rename from contrib/hunspell/src/hunspell/README
rename to aegisub/vendor/hunspell/src/hunspell/README
diff --git a/contrib/hunspell/src/hunspell/affentry.cxx b/aegisub/vendor/hunspell/src/hunspell/affentry.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/affentry.cxx
rename to aegisub/vendor/hunspell/src/hunspell/affentry.cxx
diff --git a/contrib/hunspell/src/hunspell/affentry.hxx b/aegisub/vendor/hunspell/src/hunspell/affentry.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/affentry.hxx
rename to aegisub/vendor/hunspell/src/hunspell/affentry.hxx
diff --git a/contrib/hunspell/src/hunspell/affixmgr.cxx b/aegisub/vendor/hunspell/src/hunspell/affixmgr.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/affixmgr.cxx
rename to aegisub/vendor/hunspell/src/hunspell/affixmgr.cxx
diff --git a/contrib/hunspell/src/hunspell/affixmgr.hxx b/aegisub/vendor/hunspell/src/hunspell/affixmgr.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/affixmgr.hxx
rename to aegisub/vendor/hunspell/src/hunspell/affixmgr.hxx
diff --git a/contrib/hunspell/src/hunspell/atypes.hxx b/aegisub/vendor/hunspell/src/hunspell/atypes.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/atypes.hxx
rename to aegisub/vendor/hunspell/src/hunspell/atypes.hxx
diff --git a/contrib/hunspell/src/hunspell/baseaffix.hxx b/aegisub/vendor/hunspell/src/hunspell/baseaffix.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/baseaffix.hxx
rename to aegisub/vendor/hunspell/src/hunspell/baseaffix.hxx
diff --git a/contrib/hunspell/src/hunspell/csutil.cxx b/aegisub/vendor/hunspell/src/hunspell/csutil.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/csutil.cxx
rename to aegisub/vendor/hunspell/src/hunspell/csutil.cxx
diff --git a/contrib/hunspell/src/hunspell/csutil.hxx b/aegisub/vendor/hunspell/src/hunspell/csutil.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/csutil.hxx
rename to aegisub/vendor/hunspell/src/hunspell/csutil.hxx
diff --git a/contrib/hunspell/src/hunspell/dictmgr.cxx b/aegisub/vendor/hunspell/src/hunspell/dictmgr.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/dictmgr.cxx
rename to aegisub/vendor/hunspell/src/hunspell/dictmgr.cxx
diff --git a/contrib/hunspell/src/hunspell/dictmgr.hxx b/aegisub/vendor/hunspell/src/hunspell/dictmgr.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/dictmgr.hxx
rename to aegisub/vendor/hunspell/src/hunspell/dictmgr.hxx
diff --git a/contrib/hunspell/src/hunspell/filemgr.cxx b/aegisub/vendor/hunspell/src/hunspell/filemgr.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/filemgr.cxx
rename to aegisub/vendor/hunspell/src/hunspell/filemgr.cxx
diff --git a/contrib/hunspell/src/hunspell/filemgr.hxx b/aegisub/vendor/hunspell/src/hunspell/filemgr.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/filemgr.hxx
rename to aegisub/vendor/hunspell/src/hunspell/filemgr.hxx
diff --git a/contrib/hunspell/src/hunspell/hashmgr.cxx b/aegisub/vendor/hunspell/src/hunspell/hashmgr.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/hashmgr.cxx
rename to aegisub/vendor/hunspell/src/hunspell/hashmgr.cxx
diff --git a/contrib/hunspell/src/hunspell/hashmgr.hxx b/aegisub/vendor/hunspell/src/hunspell/hashmgr.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/hashmgr.hxx
rename to aegisub/vendor/hunspell/src/hunspell/hashmgr.hxx
diff --git a/contrib/hunspell/src/hunspell/htypes.hxx b/aegisub/vendor/hunspell/src/hunspell/htypes.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/htypes.hxx
rename to aegisub/vendor/hunspell/src/hunspell/htypes.hxx
diff --git a/contrib/hunspell/src/hunspell/hunspell.cxx b/aegisub/vendor/hunspell/src/hunspell/hunspell.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/hunspell.cxx
rename to aegisub/vendor/hunspell/src/hunspell/hunspell.cxx
diff --git a/contrib/hunspell/src/hunspell/hunspell.dsp b/aegisub/vendor/hunspell/src/hunspell/hunspell.dsp
similarity index 100%
rename from contrib/hunspell/src/hunspell/hunspell.dsp
rename to aegisub/vendor/hunspell/src/hunspell/hunspell.dsp
diff --git a/contrib/hunspell/src/hunspell/hunspell.h b/aegisub/vendor/hunspell/src/hunspell/hunspell.h
similarity index 100%
rename from contrib/hunspell/src/hunspell/hunspell.h
rename to aegisub/vendor/hunspell/src/hunspell/hunspell.h
diff --git a/contrib/hunspell/src/hunspell/hunspell.hxx b/aegisub/vendor/hunspell/src/hunspell/hunspell.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/hunspell.hxx
rename to aegisub/vendor/hunspell/src/hunspell/hunspell.hxx
diff --git a/contrib/hunspell/src/hunspell/hunvisapi.h b/aegisub/vendor/hunspell/src/hunspell/hunvisapi.h
similarity index 100%
rename from contrib/hunspell/src/hunspell/hunvisapi.h
rename to aegisub/vendor/hunspell/src/hunspell/hunvisapi.h
diff --git a/contrib/hunspell/src/hunspell/hunvisapi.h.in b/aegisub/vendor/hunspell/src/hunspell/hunvisapi.h.in
similarity index 100%
rename from contrib/hunspell/src/hunspell/hunvisapi.h.in
rename to aegisub/vendor/hunspell/src/hunspell/hunvisapi.h.in
diff --git a/contrib/hunspell/src/hunspell/hunzip.cxx b/aegisub/vendor/hunspell/src/hunspell/hunzip.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/hunzip.cxx
rename to aegisub/vendor/hunspell/src/hunspell/hunzip.cxx
diff --git a/contrib/hunspell/src/hunspell/hunzip.hxx b/aegisub/vendor/hunspell/src/hunspell/hunzip.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/hunzip.hxx
rename to aegisub/vendor/hunspell/src/hunspell/hunzip.hxx
diff --git a/contrib/hunspell/src/hunspell/langnum.hxx b/aegisub/vendor/hunspell/src/hunspell/langnum.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/langnum.hxx
rename to aegisub/vendor/hunspell/src/hunspell/langnum.hxx
diff --git a/contrib/hunspell/src/hunspell/license.hunspell b/aegisub/vendor/hunspell/src/hunspell/license.hunspell
similarity index 100%
rename from contrib/hunspell/src/hunspell/license.hunspell
rename to aegisub/vendor/hunspell/src/hunspell/license.hunspell
diff --git a/contrib/hunspell/src/hunspell/license.myspell b/aegisub/vendor/hunspell/src/hunspell/license.myspell
similarity index 100%
rename from contrib/hunspell/src/hunspell/license.myspell
rename to aegisub/vendor/hunspell/src/hunspell/license.myspell
diff --git a/contrib/hunspell/src/hunspell/makefile.mk b/aegisub/vendor/hunspell/src/hunspell/makefile.mk
similarity index 100%
rename from contrib/hunspell/src/hunspell/makefile.mk
rename to aegisub/vendor/hunspell/src/hunspell/makefile.mk
diff --git a/contrib/hunspell/src/hunspell/phonet.cxx b/aegisub/vendor/hunspell/src/hunspell/phonet.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/phonet.cxx
rename to aegisub/vendor/hunspell/src/hunspell/phonet.cxx
diff --git a/contrib/hunspell/src/hunspell/phonet.hxx b/aegisub/vendor/hunspell/src/hunspell/phonet.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/phonet.hxx
rename to aegisub/vendor/hunspell/src/hunspell/phonet.hxx
diff --git a/contrib/hunspell/src/hunspell/replist.cxx b/aegisub/vendor/hunspell/src/hunspell/replist.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/replist.cxx
rename to aegisub/vendor/hunspell/src/hunspell/replist.cxx
diff --git a/contrib/hunspell/src/hunspell/replist.hxx b/aegisub/vendor/hunspell/src/hunspell/replist.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/replist.hxx
rename to aegisub/vendor/hunspell/src/hunspell/replist.hxx
diff --git a/contrib/hunspell/src/hunspell/suggestmgr.cxx b/aegisub/vendor/hunspell/src/hunspell/suggestmgr.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/suggestmgr.cxx
rename to aegisub/vendor/hunspell/src/hunspell/suggestmgr.cxx
diff --git a/contrib/hunspell/src/hunspell/suggestmgr.hxx b/aegisub/vendor/hunspell/src/hunspell/suggestmgr.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/suggestmgr.hxx
rename to aegisub/vendor/hunspell/src/hunspell/suggestmgr.hxx
diff --git a/contrib/hunspell/src/hunspell/utf_info.cxx b/aegisub/vendor/hunspell/src/hunspell/utf_info.cxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/utf_info.cxx
rename to aegisub/vendor/hunspell/src/hunspell/utf_info.cxx
diff --git a/contrib/hunspell/src/hunspell/w_char.hxx b/aegisub/vendor/hunspell/src/hunspell/w_char.hxx
similarity index 100%
rename from contrib/hunspell/src/hunspell/w_char.hxx
rename to aegisub/vendor/hunspell/src/hunspell/w_char.hxx
diff --git a/contrib/hunspell/src/parsers/firstparser.cxx b/aegisub/vendor/hunspell/src/parsers/firstparser.cxx
similarity index 100%
rename from contrib/hunspell/src/parsers/firstparser.cxx
rename to aegisub/vendor/hunspell/src/parsers/firstparser.cxx
diff --git a/contrib/hunspell/src/parsers/firstparser.hxx b/aegisub/vendor/hunspell/src/parsers/firstparser.hxx
similarity index 100%
rename from contrib/hunspell/src/parsers/firstparser.hxx
rename to aegisub/vendor/hunspell/src/parsers/firstparser.hxx
diff --git a/contrib/hunspell/src/parsers/htmlparser.cxx b/aegisub/vendor/hunspell/src/parsers/htmlparser.cxx
similarity index 100%
rename from contrib/hunspell/src/parsers/htmlparser.cxx
rename to aegisub/vendor/hunspell/src/parsers/htmlparser.cxx
diff --git a/contrib/hunspell/src/parsers/htmlparser.hxx b/aegisub/vendor/hunspell/src/parsers/htmlparser.hxx
similarity index 100%
rename from contrib/hunspell/src/parsers/htmlparser.hxx
rename to aegisub/vendor/hunspell/src/parsers/htmlparser.hxx
diff --git a/contrib/hunspell/src/parsers/latexparser.cxx b/aegisub/vendor/hunspell/src/parsers/latexparser.cxx
similarity index 100%
rename from contrib/hunspell/src/parsers/latexparser.cxx
rename to aegisub/vendor/hunspell/src/parsers/latexparser.cxx
diff --git a/contrib/hunspell/src/parsers/latexparser.hxx b/aegisub/vendor/hunspell/src/parsers/latexparser.hxx
similarity index 100%
rename from contrib/hunspell/src/parsers/latexparser.hxx
rename to aegisub/vendor/hunspell/src/parsers/latexparser.hxx
diff --git a/contrib/hunspell/src/parsers/manparser.cxx b/aegisub/vendor/hunspell/src/parsers/manparser.cxx
similarity index 100%
rename from contrib/hunspell/src/parsers/manparser.cxx
rename to aegisub/vendor/hunspell/src/parsers/manparser.cxx
diff --git a/contrib/hunspell/src/parsers/manparser.hxx b/aegisub/vendor/hunspell/src/parsers/manparser.hxx
similarity index 100%
rename from contrib/hunspell/src/parsers/manparser.hxx
rename to aegisub/vendor/hunspell/src/parsers/manparser.hxx
diff --git a/contrib/hunspell/src/parsers/testparser.cxx b/aegisub/vendor/hunspell/src/parsers/testparser.cxx
similarity index 100%
rename from contrib/hunspell/src/parsers/testparser.cxx
rename to aegisub/vendor/hunspell/src/parsers/testparser.cxx
diff --git a/contrib/hunspell/src/parsers/textparser.cxx b/aegisub/vendor/hunspell/src/parsers/textparser.cxx
similarity index 100%
rename from contrib/hunspell/src/parsers/textparser.cxx
rename to aegisub/vendor/hunspell/src/parsers/textparser.cxx
diff --git a/contrib/hunspell/src/parsers/textparser.hxx b/aegisub/vendor/hunspell/src/parsers/textparser.hxx
similarity index 100%
rename from contrib/hunspell/src/parsers/textparser.hxx
rename to aegisub/vendor/hunspell/src/parsers/textparser.hxx
diff --git a/contrib/hunspell/src/win_api/Hunspell.rc b/aegisub/vendor/hunspell/src/win_api/Hunspell.rc
similarity index 100%
rename from contrib/hunspell/src/win_api/Hunspell.rc
rename to aegisub/vendor/hunspell/src/win_api/Hunspell.rc
diff --git a/contrib/hunspell/src/win_api/config.h b/aegisub/vendor/hunspell/src/win_api/config.h
similarity index 100%
rename from contrib/hunspell/src/win_api/config.h
rename to aegisub/vendor/hunspell/src/win_api/config.h
diff --git a/contrib/hunspell/src/win_api/hunspelldll.c b/aegisub/vendor/hunspell/src/win_api/hunspelldll.c
similarity index 100%
rename from contrib/hunspell/src/win_api/hunspelldll.c
rename to aegisub/vendor/hunspell/src/win_api/hunspelldll.c
diff --git a/contrib/hunspell/src/win_api/hunspelldll.h b/aegisub/vendor/hunspell/src/win_api/hunspelldll.h
similarity index 100%
rename from contrib/hunspell/src/win_api/hunspelldll.h
rename to aegisub/vendor/hunspell/src/win_api/hunspelldll.h
diff --git a/contrib/iconv/AUTHORS b/aegisub/vendor/iconv/AUTHORS
similarity index 100%
rename from contrib/iconv/AUTHORS
rename to aegisub/vendor/iconv/AUTHORS
diff --git a/contrib/iconv/COPYING b/aegisub/vendor/iconv/COPYING
similarity index 100%
rename from contrib/iconv/COPYING
rename to aegisub/vendor/iconv/COPYING
diff --git a/contrib/iconv/ChangeLog b/aegisub/vendor/iconv/ChangeLog
similarity index 100%
rename from contrib/iconv/ChangeLog
rename to aegisub/vendor/iconv/ChangeLog
diff --git a/contrib/iconv/DEPENDENCIES b/aegisub/vendor/iconv/DEPENDENCIES
similarity index 100%
rename from contrib/iconv/DEPENDENCIES
rename to aegisub/vendor/iconv/DEPENDENCIES
diff --git a/contrib/iconv/DESIGN b/aegisub/vendor/iconv/DESIGN
similarity index 100%
rename from contrib/iconv/DESIGN
rename to aegisub/vendor/iconv/DESIGN
diff --git a/contrib/iconv/HACKING b/aegisub/vendor/iconv/HACKING
similarity index 100%
rename from contrib/iconv/HACKING
rename to aegisub/vendor/iconv/HACKING
diff --git a/contrib/iconv/NEWS b/aegisub/vendor/iconv/NEWS
similarity index 100%
rename from contrib/iconv/NEWS
rename to aegisub/vendor/iconv/NEWS
diff --git a/contrib/iconv/NOTES b/aegisub/vendor/iconv/NOTES
similarity index 100%
rename from contrib/iconv/NOTES
rename to aegisub/vendor/iconv/NOTES
diff --git a/contrib/iconv/PORTS b/aegisub/vendor/iconv/PORTS
similarity index 100%
rename from contrib/iconv/PORTS
rename to aegisub/vendor/iconv/PORTS
diff --git a/contrib/iconv/README b/aegisub/vendor/iconv/README
similarity index 100%
rename from contrib/iconv/README
rename to aegisub/vendor/iconv/README
diff --git a/contrib/iconv/THANKS b/aegisub/vendor/iconv/THANKS
similarity index 100%
rename from contrib/iconv/THANKS
rename to aegisub/vendor/iconv/THANKS
diff --git a/contrib/iconv/include/iconv.h b/aegisub/vendor/iconv/include/iconv.h
similarity index 100%
rename from contrib/iconv/include/iconv.h
rename to aegisub/vendor/iconv/include/iconv.h
diff --git a/contrib/iconv/include/libcharset.h b/aegisub/vendor/iconv/include/libcharset.h
similarity index 100%
rename from contrib/iconv/include/libcharset.h
rename to aegisub/vendor/iconv/include/libcharset.h
diff --git a/contrib/iconv/include/localcharset.h b/aegisub/vendor/iconv/include/localcharset.h
similarity index 100%
rename from contrib/iconv/include/localcharset.h
rename to aegisub/vendor/iconv/include/localcharset.h
diff --git a/contrib/iconv/include/stdbool.h b/aegisub/vendor/iconv/include/stdbool.h
similarity index 100%
rename from contrib/iconv/include/stdbool.h
rename to aegisub/vendor/iconv/include/stdbool.h
diff --git a/contrib/iconv/libcharset/config.h b/aegisub/vendor/iconv/libcharset/config.h
similarity index 100%
rename from contrib/iconv/libcharset/config.h
rename to aegisub/vendor/iconv/libcharset/config.h
diff --git a/contrib/iconv/libcharset/localcharset.c b/aegisub/vendor/iconv/libcharset/localcharset.c
similarity index 100%
rename from contrib/iconv/libcharset/localcharset.c
rename to aegisub/vendor/iconv/libcharset/localcharset.c
diff --git a/contrib/iconv/libcharset/relocatable.c b/aegisub/vendor/iconv/libcharset/relocatable.c
similarity index 100%
rename from contrib/iconv/libcharset/relocatable.c
rename to aegisub/vendor/iconv/libcharset/relocatable.c
diff --git a/contrib/iconv/libcharset/relocatable.h b/aegisub/vendor/iconv/libcharset/relocatable.h
similarity index 100%
rename from contrib/iconv/libcharset/relocatable.h
rename to aegisub/vendor/iconv/libcharset/relocatable.h
diff --git a/contrib/iconv/libiconv/aliases.h b/aegisub/vendor/iconv/libiconv/aliases.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases.h
rename to aegisub/vendor/iconv/libiconv/aliases.h
diff --git a/contrib/iconv/libiconv/aliases2.h b/aegisub/vendor/iconv/libiconv/aliases2.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases2.h
rename to aegisub/vendor/iconv/libiconv/aliases2.h
diff --git a/contrib/iconv/libiconv/aliases_aix.h b/aegisub/vendor/iconv/libiconv/aliases_aix.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_aix.h
rename to aegisub/vendor/iconv/libiconv/aliases_aix.h
diff --git a/contrib/iconv/libiconv/aliases_aix_sysaix.h b/aegisub/vendor/iconv/libiconv/aliases_aix_sysaix.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_aix_sysaix.h
rename to aegisub/vendor/iconv/libiconv/aliases_aix_sysaix.h
diff --git a/contrib/iconv/libiconv/aliases_dos.h b/aegisub/vendor/iconv/libiconv/aliases_dos.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_dos.h
rename to aegisub/vendor/iconv/libiconv/aliases_dos.h
diff --git a/contrib/iconv/libiconv/aliases_extra.h b/aegisub/vendor/iconv/libiconv/aliases_extra.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_extra.h
rename to aegisub/vendor/iconv/libiconv/aliases_extra.h
diff --git a/contrib/iconv/libiconv/aliases_osf1.h b/aegisub/vendor/iconv/libiconv/aliases_osf1.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_osf1.h
rename to aegisub/vendor/iconv/libiconv/aliases_osf1.h
diff --git a/contrib/iconv/libiconv/aliases_osf1_sysosf1.h b/aegisub/vendor/iconv/libiconv/aliases_osf1_sysosf1.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_osf1_sysosf1.h
rename to aegisub/vendor/iconv/libiconv/aliases_osf1_sysosf1.h
diff --git a/contrib/iconv/libiconv/aliases_sysaix.h b/aegisub/vendor/iconv/libiconv/aliases_sysaix.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_sysaix.h
rename to aegisub/vendor/iconv/libiconv/aliases_sysaix.h
diff --git a/contrib/iconv/libiconv/aliases_syshpux.h b/aegisub/vendor/iconv/libiconv/aliases_syshpux.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_syshpux.h
rename to aegisub/vendor/iconv/libiconv/aliases_syshpux.h
diff --git a/contrib/iconv/libiconv/aliases_sysosf1.h b/aegisub/vendor/iconv/libiconv/aliases_sysosf1.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_sysosf1.h
rename to aegisub/vendor/iconv/libiconv/aliases_sysosf1.h
diff --git a/contrib/iconv/libiconv/aliases_syssolaris.h b/aegisub/vendor/iconv/libiconv/aliases_syssolaris.h
similarity index 100%
rename from contrib/iconv/libiconv/aliases_syssolaris.h
rename to aegisub/vendor/iconv/libiconv/aliases_syssolaris.h
diff --git a/contrib/iconv/libiconv/armscii_8.h b/aegisub/vendor/iconv/libiconv/armscii_8.h
similarity index 100%
rename from contrib/iconv/libiconv/armscii_8.h
rename to aegisub/vendor/iconv/libiconv/armscii_8.h
diff --git a/contrib/iconv/libiconv/ascii.h b/aegisub/vendor/iconv/libiconv/ascii.h
similarity index 100%
rename from contrib/iconv/libiconv/ascii.h
rename to aegisub/vendor/iconv/libiconv/ascii.h
diff --git a/contrib/iconv/libiconv/atarist.h b/aegisub/vendor/iconv/libiconv/atarist.h
similarity index 100%
rename from contrib/iconv/libiconv/atarist.h
rename to aegisub/vendor/iconv/libiconv/atarist.h
diff --git a/contrib/iconv/libiconv/big5.h b/aegisub/vendor/iconv/libiconv/big5.h
similarity index 100%
rename from contrib/iconv/libiconv/big5.h
rename to aegisub/vendor/iconv/libiconv/big5.h
diff --git a/contrib/iconv/libiconv/big5_2003.h b/aegisub/vendor/iconv/libiconv/big5_2003.h
similarity index 100%
rename from contrib/iconv/libiconv/big5_2003.h
rename to aegisub/vendor/iconv/libiconv/big5_2003.h
diff --git a/contrib/iconv/libiconv/big5hkscs1999.h b/aegisub/vendor/iconv/libiconv/big5hkscs1999.h
similarity index 100%
rename from contrib/iconv/libiconv/big5hkscs1999.h
rename to aegisub/vendor/iconv/libiconv/big5hkscs1999.h
diff --git a/contrib/iconv/libiconv/big5hkscs2001.h b/aegisub/vendor/iconv/libiconv/big5hkscs2001.h
similarity index 100%
rename from contrib/iconv/libiconv/big5hkscs2001.h
rename to aegisub/vendor/iconv/libiconv/big5hkscs2001.h
diff --git a/contrib/iconv/libiconv/big5hkscs2004.h b/aegisub/vendor/iconv/libiconv/big5hkscs2004.h
similarity index 100%
rename from contrib/iconv/libiconv/big5hkscs2004.h
rename to aegisub/vendor/iconv/libiconv/big5hkscs2004.h
diff --git a/contrib/iconv/libiconv/c99.h b/aegisub/vendor/iconv/libiconv/c99.h
similarity index 100%
rename from contrib/iconv/libiconv/c99.h
rename to aegisub/vendor/iconv/libiconv/c99.h
diff --git a/contrib/iconv/libiconv/canonical.h b/aegisub/vendor/iconv/libiconv/canonical.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical.h
rename to aegisub/vendor/iconv/libiconv/canonical.h
diff --git a/contrib/iconv/libiconv/canonical_aix.h b/aegisub/vendor/iconv/libiconv/canonical_aix.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_aix.h
rename to aegisub/vendor/iconv/libiconv/canonical_aix.h
diff --git a/contrib/iconv/libiconv/canonical_aix_sysaix.h b/aegisub/vendor/iconv/libiconv/canonical_aix_sysaix.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_aix_sysaix.h
rename to aegisub/vendor/iconv/libiconv/canonical_aix_sysaix.h
diff --git a/contrib/iconv/libiconv/canonical_dos.h b/aegisub/vendor/iconv/libiconv/canonical_dos.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_dos.h
rename to aegisub/vendor/iconv/libiconv/canonical_dos.h
diff --git a/contrib/iconv/libiconv/canonical_extra.h b/aegisub/vendor/iconv/libiconv/canonical_extra.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_extra.h
rename to aegisub/vendor/iconv/libiconv/canonical_extra.h
diff --git a/contrib/iconv/libiconv/canonical_local.h b/aegisub/vendor/iconv/libiconv/canonical_local.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_local.h
rename to aegisub/vendor/iconv/libiconv/canonical_local.h
diff --git a/contrib/iconv/libiconv/canonical_local_sysaix.h b/aegisub/vendor/iconv/libiconv/canonical_local_sysaix.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_local_sysaix.h
rename to aegisub/vendor/iconv/libiconv/canonical_local_sysaix.h
diff --git a/contrib/iconv/libiconv/canonical_local_syshpux.h b/aegisub/vendor/iconv/libiconv/canonical_local_syshpux.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_local_syshpux.h
rename to aegisub/vendor/iconv/libiconv/canonical_local_syshpux.h
diff --git a/contrib/iconv/libiconv/canonical_local_sysosf1.h b/aegisub/vendor/iconv/libiconv/canonical_local_sysosf1.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_local_sysosf1.h
rename to aegisub/vendor/iconv/libiconv/canonical_local_sysosf1.h
diff --git a/contrib/iconv/libiconv/canonical_local_syssolaris.h b/aegisub/vendor/iconv/libiconv/canonical_local_syssolaris.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_local_syssolaris.h
rename to aegisub/vendor/iconv/libiconv/canonical_local_syssolaris.h
diff --git a/contrib/iconv/libiconv/canonical_osf1.h b/aegisub/vendor/iconv/libiconv/canonical_osf1.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_osf1.h
rename to aegisub/vendor/iconv/libiconv/canonical_osf1.h
diff --git a/contrib/iconv/libiconv/canonical_osf1_sysosf1.h b/aegisub/vendor/iconv/libiconv/canonical_osf1_sysosf1.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_osf1_sysosf1.h
rename to aegisub/vendor/iconv/libiconv/canonical_osf1_sysosf1.h
diff --git a/contrib/iconv/libiconv/canonical_sysaix.h b/aegisub/vendor/iconv/libiconv/canonical_sysaix.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_sysaix.h
rename to aegisub/vendor/iconv/libiconv/canonical_sysaix.h
diff --git a/contrib/iconv/libiconv/canonical_syshpux.h b/aegisub/vendor/iconv/libiconv/canonical_syshpux.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_syshpux.h
rename to aegisub/vendor/iconv/libiconv/canonical_syshpux.h
diff --git a/contrib/iconv/libiconv/canonical_sysosf1.h b/aegisub/vendor/iconv/libiconv/canonical_sysosf1.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_sysosf1.h
rename to aegisub/vendor/iconv/libiconv/canonical_sysosf1.h
diff --git a/contrib/iconv/libiconv/canonical_syssolaris.h b/aegisub/vendor/iconv/libiconv/canonical_syssolaris.h
similarity index 100%
rename from contrib/iconv/libiconv/canonical_syssolaris.h
rename to aegisub/vendor/iconv/libiconv/canonical_syssolaris.h
diff --git a/contrib/iconv/libiconv/ces_big5.h b/aegisub/vendor/iconv/libiconv/ces_big5.h
similarity index 100%
rename from contrib/iconv/libiconv/ces_big5.h
rename to aegisub/vendor/iconv/libiconv/ces_big5.h
diff --git a/contrib/iconv/libiconv/ces_gbk.h b/aegisub/vendor/iconv/libiconv/ces_gbk.h
similarity index 100%
rename from contrib/iconv/libiconv/ces_gbk.h
rename to aegisub/vendor/iconv/libiconv/ces_gbk.h
diff --git a/contrib/iconv/libiconv/charset.alias b/aegisub/vendor/iconv/libiconv/charset.alias
similarity index 100%
rename from contrib/iconv/libiconv/charset.alias
rename to aegisub/vendor/iconv/libiconv/charset.alias
diff --git a/contrib/iconv/libiconv/cjk_variants.h b/aegisub/vendor/iconv/libiconv/cjk_variants.h
similarity index 100%
rename from contrib/iconv/libiconv/cjk_variants.h
rename to aegisub/vendor/iconv/libiconv/cjk_variants.h
diff --git a/contrib/iconv/libiconv/cns11643.h b/aegisub/vendor/iconv/libiconv/cns11643.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643.h
rename to aegisub/vendor/iconv/libiconv/cns11643.h
diff --git a/contrib/iconv/libiconv/cns11643_1.h b/aegisub/vendor/iconv/libiconv/cns11643_1.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_1.h
rename to aegisub/vendor/iconv/libiconv/cns11643_1.h
diff --git a/contrib/iconv/libiconv/cns11643_15.h b/aegisub/vendor/iconv/libiconv/cns11643_15.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_15.h
rename to aegisub/vendor/iconv/libiconv/cns11643_15.h
diff --git a/contrib/iconv/libiconv/cns11643_2.h b/aegisub/vendor/iconv/libiconv/cns11643_2.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_2.h
rename to aegisub/vendor/iconv/libiconv/cns11643_2.h
diff --git a/contrib/iconv/libiconv/cns11643_3.h b/aegisub/vendor/iconv/libiconv/cns11643_3.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_3.h
rename to aegisub/vendor/iconv/libiconv/cns11643_3.h
diff --git a/contrib/iconv/libiconv/cns11643_4.h b/aegisub/vendor/iconv/libiconv/cns11643_4.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_4.h
rename to aegisub/vendor/iconv/libiconv/cns11643_4.h
diff --git a/contrib/iconv/libiconv/cns11643_4a.h b/aegisub/vendor/iconv/libiconv/cns11643_4a.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_4a.h
rename to aegisub/vendor/iconv/libiconv/cns11643_4a.h
diff --git a/contrib/iconv/libiconv/cns11643_4b.h b/aegisub/vendor/iconv/libiconv/cns11643_4b.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_4b.h
rename to aegisub/vendor/iconv/libiconv/cns11643_4b.h
diff --git a/contrib/iconv/libiconv/cns11643_5.h b/aegisub/vendor/iconv/libiconv/cns11643_5.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_5.h
rename to aegisub/vendor/iconv/libiconv/cns11643_5.h
diff --git a/contrib/iconv/libiconv/cns11643_6.h b/aegisub/vendor/iconv/libiconv/cns11643_6.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_6.h
rename to aegisub/vendor/iconv/libiconv/cns11643_6.h
diff --git a/contrib/iconv/libiconv/cns11643_7.h b/aegisub/vendor/iconv/libiconv/cns11643_7.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_7.h
rename to aegisub/vendor/iconv/libiconv/cns11643_7.h
diff --git a/contrib/iconv/libiconv/cns11643_inv.h b/aegisub/vendor/iconv/libiconv/cns11643_inv.h
similarity index 100%
rename from contrib/iconv/libiconv/cns11643_inv.h
rename to aegisub/vendor/iconv/libiconv/cns11643_inv.h
diff --git a/contrib/iconv/libiconv/config.h b/aegisub/vendor/iconv/libiconv/config.h
similarity index 100%
rename from contrib/iconv/libiconv/config.h
rename to aegisub/vendor/iconv/libiconv/config.h
diff --git a/contrib/iconv/libiconv/converters.h b/aegisub/vendor/iconv/libiconv/converters.h
similarity index 100%
rename from contrib/iconv/libiconv/converters.h
rename to aegisub/vendor/iconv/libiconv/converters.h
diff --git a/contrib/iconv/libiconv/cp1046.h b/aegisub/vendor/iconv/libiconv/cp1046.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1046.h
rename to aegisub/vendor/iconv/libiconv/cp1046.h
diff --git a/contrib/iconv/libiconv/cp1124.h b/aegisub/vendor/iconv/libiconv/cp1124.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1124.h
rename to aegisub/vendor/iconv/libiconv/cp1124.h
diff --git a/contrib/iconv/libiconv/cp1125.h b/aegisub/vendor/iconv/libiconv/cp1125.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1125.h
rename to aegisub/vendor/iconv/libiconv/cp1125.h
diff --git a/contrib/iconv/libiconv/cp1129.h b/aegisub/vendor/iconv/libiconv/cp1129.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1129.h
rename to aegisub/vendor/iconv/libiconv/cp1129.h
diff --git a/contrib/iconv/libiconv/cp1131.h b/aegisub/vendor/iconv/libiconv/cp1131.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1131.h
rename to aegisub/vendor/iconv/libiconv/cp1131.h
diff --git a/contrib/iconv/libiconv/cp1133.h b/aegisub/vendor/iconv/libiconv/cp1133.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1133.h
rename to aegisub/vendor/iconv/libiconv/cp1133.h
diff --git a/contrib/iconv/libiconv/cp1161.h b/aegisub/vendor/iconv/libiconv/cp1161.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1161.h
rename to aegisub/vendor/iconv/libiconv/cp1161.h
diff --git a/contrib/iconv/libiconv/cp1162.h b/aegisub/vendor/iconv/libiconv/cp1162.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1162.h
rename to aegisub/vendor/iconv/libiconv/cp1162.h
diff --git a/contrib/iconv/libiconv/cp1163.h b/aegisub/vendor/iconv/libiconv/cp1163.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1163.h
rename to aegisub/vendor/iconv/libiconv/cp1163.h
diff --git a/contrib/iconv/libiconv/cp1250.h b/aegisub/vendor/iconv/libiconv/cp1250.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1250.h
rename to aegisub/vendor/iconv/libiconv/cp1250.h
diff --git a/contrib/iconv/libiconv/cp1251.h b/aegisub/vendor/iconv/libiconv/cp1251.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1251.h
rename to aegisub/vendor/iconv/libiconv/cp1251.h
diff --git a/contrib/iconv/libiconv/cp1252.h b/aegisub/vendor/iconv/libiconv/cp1252.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1252.h
rename to aegisub/vendor/iconv/libiconv/cp1252.h
diff --git a/contrib/iconv/libiconv/cp1253.h b/aegisub/vendor/iconv/libiconv/cp1253.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1253.h
rename to aegisub/vendor/iconv/libiconv/cp1253.h
diff --git a/contrib/iconv/libiconv/cp1254.h b/aegisub/vendor/iconv/libiconv/cp1254.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1254.h
rename to aegisub/vendor/iconv/libiconv/cp1254.h
diff --git a/contrib/iconv/libiconv/cp1255.h b/aegisub/vendor/iconv/libiconv/cp1255.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1255.h
rename to aegisub/vendor/iconv/libiconv/cp1255.h
diff --git a/contrib/iconv/libiconv/cp1256.h b/aegisub/vendor/iconv/libiconv/cp1256.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1256.h
rename to aegisub/vendor/iconv/libiconv/cp1256.h
diff --git a/contrib/iconv/libiconv/cp1257.h b/aegisub/vendor/iconv/libiconv/cp1257.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1257.h
rename to aegisub/vendor/iconv/libiconv/cp1257.h
diff --git a/contrib/iconv/libiconv/cp1258.h b/aegisub/vendor/iconv/libiconv/cp1258.h
similarity index 100%
rename from contrib/iconv/libiconv/cp1258.h
rename to aegisub/vendor/iconv/libiconv/cp1258.h
diff --git a/contrib/iconv/libiconv/cp437.h b/aegisub/vendor/iconv/libiconv/cp437.h
similarity index 100%
rename from contrib/iconv/libiconv/cp437.h
rename to aegisub/vendor/iconv/libiconv/cp437.h
diff --git a/contrib/iconv/libiconv/cp737.h b/aegisub/vendor/iconv/libiconv/cp737.h
similarity index 100%
rename from contrib/iconv/libiconv/cp737.h
rename to aegisub/vendor/iconv/libiconv/cp737.h
diff --git a/contrib/iconv/libiconv/cp775.h b/aegisub/vendor/iconv/libiconv/cp775.h
similarity index 100%
rename from contrib/iconv/libiconv/cp775.h
rename to aegisub/vendor/iconv/libiconv/cp775.h
diff --git a/contrib/iconv/libiconv/cp850.h b/aegisub/vendor/iconv/libiconv/cp850.h
similarity index 100%
rename from contrib/iconv/libiconv/cp850.h
rename to aegisub/vendor/iconv/libiconv/cp850.h
diff --git a/contrib/iconv/libiconv/cp852.h b/aegisub/vendor/iconv/libiconv/cp852.h
similarity index 100%
rename from contrib/iconv/libiconv/cp852.h
rename to aegisub/vendor/iconv/libiconv/cp852.h
diff --git a/contrib/iconv/libiconv/cp853.h b/aegisub/vendor/iconv/libiconv/cp853.h
similarity index 100%
rename from contrib/iconv/libiconv/cp853.h
rename to aegisub/vendor/iconv/libiconv/cp853.h
diff --git a/contrib/iconv/libiconv/cp855.h b/aegisub/vendor/iconv/libiconv/cp855.h
similarity index 100%
rename from contrib/iconv/libiconv/cp855.h
rename to aegisub/vendor/iconv/libiconv/cp855.h
diff --git a/contrib/iconv/libiconv/cp856.h b/aegisub/vendor/iconv/libiconv/cp856.h
similarity index 100%
rename from contrib/iconv/libiconv/cp856.h
rename to aegisub/vendor/iconv/libiconv/cp856.h
diff --git a/contrib/iconv/libiconv/cp857.h b/aegisub/vendor/iconv/libiconv/cp857.h
similarity index 100%
rename from contrib/iconv/libiconv/cp857.h
rename to aegisub/vendor/iconv/libiconv/cp857.h
diff --git a/contrib/iconv/libiconv/cp858.h b/aegisub/vendor/iconv/libiconv/cp858.h
similarity index 100%
rename from contrib/iconv/libiconv/cp858.h
rename to aegisub/vendor/iconv/libiconv/cp858.h
diff --git a/contrib/iconv/libiconv/cp860.h b/aegisub/vendor/iconv/libiconv/cp860.h
similarity index 100%
rename from contrib/iconv/libiconv/cp860.h
rename to aegisub/vendor/iconv/libiconv/cp860.h
diff --git a/contrib/iconv/libiconv/cp861.h b/aegisub/vendor/iconv/libiconv/cp861.h
similarity index 100%
rename from contrib/iconv/libiconv/cp861.h
rename to aegisub/vendor/iconv/libiconv/cp861.h
diff --git a/contrib/iconv/libiconv/cp862.h b/aegisub/vendor/iconv/libiconv/cp862.h
similarity index 100%
rename from contrib/iconv/libiconv/cp862.h
rename to aegisub/vendor/iconv/libiconv/cp862.h
diff --git a/contrib/iconv/libiconv/cp863.h b/aegisub/vendor/iconv/libiconv/cp863.h
similarity index 100%
rename from contrib/iconv/libiconv/cp863.h
rename to aegisub/vendor/iconv/libiconv/cp863.h
diff --git a/contrib/iconv/libiconv/cp864.h b/aegisub/vendor/iconv/libiconv/cp864.h
similarity index 100%
rename from contrib/iconv/libiconv/cp864.h
rename to aegisub/vendor/iconv/libiconv/cp864.h
diff --git a/contrib/iconv/libiconv/cp865.h b/aegisub/vendor/iconv/libiconv/cp865.h
similarity index 100%
rename from contrib/iconv/libiconv/cp865.h
rename to aegisub/vendor/iconv/libiconv/cp865.h
diff --git a/contrib/iconv/libiconv/cp866.h b/aegisub/vendor/iconv/libiconv/cp866.h
similarity index 100%
rename from contrib/iconv/libiconv/cp866.h
rename to aegisub/vendor/iconv/libiconv/cp866.h
diff --git a/contrib/iconv/libiconv/cp869.h b/aegisub/vendor/iconv/libiconv/cp869.h
similarity index 100%
rename from contrib/iconv/libiconv/cp869.h
rename to aegisub/vendor/iconv/libiconv/cp869.h
diff --git a/contrib/iconv/libiconv/cp874.h b/aegisub/vendor/iconv/libiconv/cp874.h
similarity index 100%
rename from contrib/iconv/libiconv/cp874.h
rename to aegisub/vendor/iconv/libiconv/cp874.h
diff --git a/contrib/iconv/libiconv/cp922.h b/aegisub/vendor/iconv/libiconv/cp922.h
similarity index 100%
rename from contrib/iconv/libiconv/cp922.h
rename to aegisub/vendor/iconv/libiconv/cp922.h
diff --git a/contrib/iconv/libiconv/cp932.h b/aegisub/vendor/iconv/libiconv/cp932.h
similarity index 100%
rename from contrib/iconv/libiconv/cp932.h
rename to aegisub/vendor/iconv/libiconv/cp932.h
diff --git a/contrib/iconv/libiconv/cp932ext.h b/aegisub/vendor/iconv/libiconv/cp932ext.h
similarity index 100%
rename from contrib/iconv/libiconv/cp932ext.h
rename to aegisub/vendor/iconv/libiconv/cp932ext.h
diff --git a/contrib/iconv/libiconv/cp936.h b/aegisub/vendor/iconv/libiconv/cp936.h
similarity index 100%
rename from contrib/iconv/libiconv/cp936.h
rename to aegisub/vendor/iconv/libiconv/cp936.h
diff --git a/contrib/iconv/libiconv/cp936ext.h b/aegisub/vendor/iconv/libiconv/cp936ext.h
similarity index 100%
rename from contrib/iconv/libiconv/cp936ext.h
rename to aegisub/vendor/iconv/libiconv/cp936ext.h
diff --git a/contrib/iconv/libiconv/cp943.h b/aegisub/vendor/iconv/libiconv/cp943.h
similarity index 100%
rename from contrib/iconv/libiconv/cp943.h
rename to aegisub/vendor/iconv/libiconv/cp943.h
diff --git a/contrib/iconv/libiconv/cp949.h b/aegisub/vendor/iconv/libiconv/cp949.h
similarity index 100%
rename from contrib/iconv/libiconv/cp949.h
rename to aegisub/vendor/iconv/libiconv/cp949.h
diff --git a/contrib/iconv/libiconv/cp950.h b/aegisub/vendor/iconv/libiconv/cp950.h
similarity index 100%
rename from contrib/iconv/libiconv/cp950.h
rename to aegisub/vendor/iconv/libiconv/cp950.h
diff --git a/contrib/iconv/libiconv/cp950ext.h b/aegisub/vendor/iconv/libiconv/cp950ext.h
similarity index 100%
rename from contrib/iconv/libiconv/cp950ext.h
rename to aegisub/vendor/iconv/libiconv/cp950ext.h
diff --git a/contrib/iconv/libiconv/dec_hanyu.h b/aegisub/vendor/iconv/libiconv/dec_hanyu.h
similarity index 100%
rename from contrib/iconv/libiconv/dec_hanyu.h
rename to aegisub/vendor/iconv/libiconv/dec_hanyu.h
diff --git a/contrib/iconv/libiconv/dec_kanji.h b/aegisub/vendor/iconv/libiconv/dec_kanji.h
similarity index 100%
rename from contrib/iconv/libiconv/dec_kanji.h
rename to aegisub/vendor/iconv/libiconv/dec_kanji.h
diff --git a/contrib/iconv/libiconv/encodings.def b/aegisub/vendor/iconv/libiconv/encodings.def
similarity index 100%
rename from contrib/iconv/libiconv/encodings.def
rename to aegisub/vendor/iconv/libiconv/encodings.def
diff --git a/contrib/iconv/libiconv/encodings_aix.def b/aegisub/vendor/iconv/libiconv/encodings_aix.def
similarity index 100%
rename from contrib/iconv/libiconv/encodings_aix.def
rename to aegisub/vendor/iconv/libiconv/encodings_aix.def
diff --git a/contrib/iconv/libiconv/encodings_dos.def b/aegisub/vendor/iconv/libiconv/encodings_dos.def
similarity index 100%
rename from contrib/iconv/libiconv/encodings_dos.def
rename to aegisub/vendor/iconv/libiconv/encodings_dos.def
diff --git a/contrib/iconv/libiconv/encodings_extra.def b/aegisub/vendor/iconv/libiconv/encodings_extra.def
similarity index 100%
rename from contrib/iconv/libiconv/encodings_extra.def
rename to aegisub/vendor/iconv/libiconv/encodings_extra.def
diff --git a/contrib/iconv/libiconv/encodings_local.def b/aegisub/vendor/iconv/libiconv/encodings_local.def
similarity index 100%
rename from contrib/iconv/libiconv/encodings_local.def
rename to aegisub/vendor/iconv/libiconv/encodings_local.def
diff --git a/contrib/iconv/libiconv/encodings_osf1.def b/aegisub/vendor/iconv/libiconv/encodings_osf1.def
similarity index 100%
rename from contrib/iconv/libiconv/encodings_osf1.def
rename to aegisub/vendor/iconv/libiconv/encodings_osf1.def
diff --git a/contrib/iconv/libiconv/euc_cn.h b/aegisub/vendor/iconv/libiconv/euc_cn.h
similarity index 100%
rename from contrib/iconv/libiconv/euc_cn.h
rename to aegisub/vendor/iconv/libiconv/euc_cn.h
diff --git a/contrib/iconv/libiconv/euc_jisx0213.h b/aegisub/vendor/iconv/libiconv/euc_jisx0213.h
similarity index 100%
rename from contrib/iconv/libiconv/euc_jisx0213.h
rename to aegisub/vendor/iconv/libiconv/euc_jisx0213.h
diff --git a/contrib/iconv/libiconv/euc_jp.h b/aegisub/vendor/iconv/libiconv/euc_jp.h
similarity index 100%
rename from contrib/iconv/libiconv/euc_jp.h
rename to aegisub/vendor/iconv/libiconv/euc_jp.h
diff --git a/contrib/iconv/libiconv/euc_kr.h b/aegisub/vendor/iconv/libiconv/euc_kr.h
similarity index 100%
rename from contrib/iconv/libiconv/euc_kr.h
rename to aegisub/vendor/iconv/libiconv/euc_kr.h
diff --git a/contrib/iconv/libiconv/euc_tw.h b/aegisub/vendor/iconv/libiconv/euc_tw.h
similarity index 100%
rename from contrib/iconv/libiconv/euc_tw.h
rename to aegisub/vendor/iconv/libiconv/euc_tw.h
diff --git a/contrib/iconv/libiconv/flags.h b/aegisub/vendor/iconv/libiconv/flags.h
similarity index 100%
rename from contrib/iconv/libiconv/flags.h
rename to aegisub/vendor/iconv/libiconv/flags.h
diff --git a/contrib/iconv/libiconv/flushwc.h b/aegisub/vendor/iconv/libiconv/flushwc.h
similarity index 100%
rename from contrib/iconv/libiconv/flushwc.h
rename to aegisub/vendor/iconv/libiconv/flushwc.h
diff --git a/contrib/iconv/libiconv/gb12345.h b/aegisub/vendor/iconv/libiconv/gb12345.h
similarity index 100%
rename from contrib/iconv/libiconv/gb12345.h
rename to aegisub/vendor/iconv/libiconv/gb12345.h
diff --git a/contrib/iconv/libiconv/gb12345ext.h b/aegisub/vendor/iconv/libiconv/gb12345ext.h
similarity index 100%
rename from contrib/iconv/libiconv/gb12345ext.h
rename to aegisub/vendor/iconv/libiconv/gb12345ext.h
diff --git a/contrib/iconv/libiconv/gb18030.h b/aegisub/vendor/iconv/libiconv/gb18030.h
similarity index 100%
rename from contrib/iconv/libiconv/gb18030.h
rename to aegisub/vendor/iconv/libiconv/gb18030.h
diff --git a/contrib/iconv/libiconv/gb18030ext.h b/aegisub/vendor/iconv/libiconv/gb18030ext.h
similarity index 100%
rename from contrib/iconv/libiconv/gb18030ext.h
rename to aegisub/vendor/iconv/libiconv/gb18030ext.h
diff --git a/contrib/iconv/libiconv/gb18030uni.h b/aegisub/vendor/iconv/libiconv/gb18030uni.h
similarity index 100%
rename from contrib/iconv/libiconv/gb18030uni.h
rename to aegisub/vendor/iconv/libiconv/gb18030uni.h
diff --git a/contrib/iconv/libiconv/gb2312.h b/aegisub/vendor/iconv/libiconv/gb2312.h
similarity index 100%
rename from contrib/iconv/libiconv/gb2312.h
rename to aegisub/vendor/iconv/libiconv/gb2312.h
diff --git a/contrib/iconv/libiconv/gbk.h b/aegisub/vendor/iconv/libiconv/gbk.h
similarity index 100%
rename from contrib/iconv/libiconv/gbk.h
rename to aegisub/vendor/iconv/libiconv/gbk.h
diff --git a/contrib/iconv/libiconv/gbkext1.h b/aegisub/vendor/iconv/libiconv/gbkext1.h
similarity index 100%
rename from contrib/iconv/libiconv/gbkext1.h
rename to aegisub/vendor/iconv/libiconv/gbkext1.h
diff --git a/contrib/iconv/libiconv/gbkext2.h b/aegisub/vendor/iconv/libiconv/gbkext2.h
similarity index 100%
rename from contrib/iconv/libiconv/gbkext2.h
rename to aegisub/vendor/iconv/libiconv/gbkext2.h
diff --git a/contrib/iconv/libiconv/gbkext_inv.h b/aegisub/vendor/iconv/libiconv/gbkext_inv.h
similarity index 100%
rename from contrib/iconv/libiconv/gbkext_inv.h
rename to aegisub/vendor/iconv/libiconv/gbkext_inv.h
diff --git a/contrib/iconv/libiconv/genaliases.c b/aegisub/vendor/iconv/libiconv/genaliases.c
similarity index 100%
rename from contrib/iconv/libiconv/genaliases.c
rename to aegisub/vendor/iconv/libiconv/genaliases.c
diff --git a/contrib/iconv/libiconv/genaliases2.c b/aegisub/vendor/iconv/libiconv/genaliases2.c
similarity index 100%
rename from contrib/iconv/libiconv/genaliases2.c
rename to aegisub/vendor/iconv/libiconv/genaliases2.c
diff --git a/contrib/iconv/libiconv/genflags.c b/aegisub/vendor/iconv/libiconv/genflags.c
similarity index 100%
rename from contrib/iconv/libiconv/genflags.c
rename to aegisub/vendor/iconv/libiconv/genflags.c
diff --git a/contrib/iconv/libiconv/gentranslit.c b/aegisub/vendor/iconv/libiconv/gentranslit.c
similarity index 100%
rename from contrib/iconv/libiconv/gentranslit.c
rename to aegisub/vendor/iconv/libiconv/gentranslit.c
diff --git a/contrib/iconv/libiconv/georgian_academy.h b/aegisub/vendor/iconv/libiconv/georgian_academy.h
similarity index 100%
rename from contrib/iconv/libiconv/georgian_academy.h
rename to aegisub/vendor/iconv/libiconv/georgian_academy.h
diff --git a/contrib/iconv/libiconv/georgian_ps.h b/aegisub/vendor/iconv/libiconv/georgian_ps.h
similarity index 100%
rename from contrib/iconv/libiconv/georgian_ps.h
rename to aegisub/vendor/iconv/libiconv/georgian_ps.h
diff --git a/contrib/iconv/libiconv/hkscs1999.h b/aegisub/vendor/iconv/libiconv/hkscs1999.h
similarity index 100%
rename from contrib/iconv/libiconv/hkscs1999.h
rename to aegisub/vendor/iconv/libiconv/hkscs1999.h
diff --git a/contrib/iconv/libiconv/hkscs2001.h b/aegisub/vendor/iconv/libiconv/hkscs2001.h
similarity index 100%
rename from contrib/iconv/libiconv/hkscs2001.h
rename to aegisub/vendor/iconv/libiconv/hkscs2001.h
diff --git a/contrib/iconv/libiconv/hkscs2004.h b/aegisub/vendor/iconv/libiconv/hkscs2004.h
similarity index 100%
rename from contrib/iconv/libiconv/hkscs2004.h
rename to aegisub/vendor/iconv/libiconv/hkscs2004.h
diff --git a/contrib/iconv/libiconv/hp_roman8.h b/aegisub/vendor/iconv/libiconv/hp_roman8.h
similarity index 100%
rename from contrib/iconv/libiconv/hp_roman8.h
rename to aegisub/vendor/iconv/libiconv/hp_roman8.h
diff --git a/contrib/iconv/libiconv/hz.h b/aegisub/vendor/iconv/libiconv/hz.h
similarity index 100%
rename from contrib/iconv/libiconv/hz.h
rename to aegisub/vendor/iconv/libiconv/hz.h
diff --git a/contrib/iconv/libiconv/iconv.c b/aegisub/vendor/iconv/libiconv/iconv.c
similarity index 100%
rename from contrib/iconv/libiconv/iconv.c
rename to aegisub/vendor/iconv/libiconv/iconv.c
diff --git a/contrib/iconv/libiconv/iconv_open1.h b/aegisub/vendor/iconv/libiconv/iconv_open1.h
similarity index 100%
rename from contrib/iconv/libiconv/iconv_open1.h
rename to aegisub/vendor/iconv/libiconv/iconv_open1.h
diff --git a/contrib/iconv/libiconv/iconv_open2.h b/aegisub/vendor/iconv/libiconv/iconv_open2.h
similarity index 100%
rename from contrib/iconv/libiconv/iconv_open2.h
rename to aegisub/vendor/iconv/libiconv/iconv_open2.h
diff --git a/contrib/iconv/libiconv/iso2022_cn.h b/aegisub/vendor/iconv/libiconv/iso2022_cn.h
similarity index 100%
rename from contrib/iconv/libiconv/iso2022_cn.h
rename to aegisub/vendor/iconv/libiconv/iso2022_cn.h
diff --git a/contrib/iconv/libiconv/iso2022_cnext.h b/aegisub/vendor/iconv/libiconv/iso2022_cnext.h
similarity index 100%
rename from contrib/iconv/libiconv/iso2022_cnext.h
rename to aegisub/vendor/iconv/libiconv/iso2022_cnext.h
diff --git a/contrib/iconv/libiconv/iso2022_jp.h b/aegisub/vendor/iconv/libiconv/iso2022_jp.h
similarity index 100%
rename from contrib/iconv/libiconv/iso2022_jp.h
rename to aegisub/vendor/iconv/libiconv/iso2022_jp.h
diff --git a/contrib/iconv/libiconv/iso2022_jp1.h b/aegisub/vendor/iconv/libiconv/iso2022_jp1.h
similarity index 100%
rename from contrib/iconv/libiconv/iso2022_jp1.h
rename to aegisub/vendor/iconv/libiconv/iso2022_jp1.h
diff --git a/contrib/iconv/libiconv/iso2022_jp2.h b/aegisub/vendor/iconv/libiconv/iso2022_jp2.h
similarity index 100%
rename from contrib/iconv/libiconv/iso2022_jp2.h
rename to aegisub/vendor/iconv/libiconv/iso2022_jp2.h
diff --git a/contrib/iconv/libiconv/iso2022_jp3.h b/aegisub/vendor/iconv/libiconv/iso2022_jp3.h
similarity index 100%
rename from contrib/iconv/libiconv/iso2022_jp3.h
rename to aegisub/vendor/iconv/libiconv/iso2022_jp3.h
diff --git a/contrib/iconv/libiconv/iso2022_kr.h b/aegisub/vendor/iconv/libiconv/iso2022_kr.h
similarity index 100%
rename from contrib/iconv/libiconv/iso2022_kr.h
rename to aegisub/vendor/iconv/libiconv/iso2022_kr.h
diff --git a/contrib/iconv/libiconv/iso646_cn.h b/aegisub/vendor/iconv/libiconv/iso646_cn.h
similarity index 100%
rename from contrib/iconv/libiconv/iso646_cn.h
rename to aegisub/vendor/iconv/libiconv/iso646_cn.h
diff --git a/contrib/iconv/libiconv/iso646_jp.h b/aegisub/vendor/iconv/libiconv/iso646_jp.h
similarity index 100%
rename from contrib/iconv/libiconv/iso646_jp.h
rename to aegisub/vendor/iconv/libiconv/iso646_jp.h
diff --git a/contrib/iconv/libiconv/iso8859_1.h b/aegisub/vendor/iconv/libiconv/iso8859_1.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_1.h
rename to aegisub/vendor/iconv/libiconv/iso8859_1.h
diff --git a/contrib/iconv/libiconv/iso8859_10.h b/aegisub/vendor/iconv/libiconv/iso8859_10.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_10.h
rename to aegisub/vendor/iconv/libiconv/iso8859_10.h
diff --git a/contrib/iconv/libiconv/iso8859_11.h b/aegisub/vendor/iconv/libiconv/iso8859_11.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_11.h
rename to aegisub/vendor/iconv/libiconv/iso8859_11.h
diff --git a/contrib/iconv/libiconv/iso8859_13.h b/aegisub/vendor/iconv/libiconv/iso8859_13.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_13.h
rename to aegisub/vendor/iconv/libiconv/iso8859_13.h
diff --git a/contrib/iconv/libiconv/iso8859_14.h b/aegisub/vendor/iconv/libiconv/iso8859_14.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_14.h
rename to aegisub/vendor/iconv/libiconv/iso8859_14.h
diff --git a/contrib/iconv/libiconv/iso8859_15.h b/aegisub/vendor/iconv/libiconv/iso8859_15.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_15.h
rename to aegisub/vendor/iconv/libiconv/iso8859_15.h
diff --git a/contrib/iconv/libiconv/iso8859_16.h b/aegisub/vendor/iconv/libiconv/iso8859_16.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_16.h
rename to aegisub/vendor/iconv/libiconv/iso8859_16.h
diff --git a/contrib/iconv/libiconv/iso8859_2.h b/aegisub/vendor/iconv/libiconv/iso8859_2.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_2.h
rename to aegisub/vendor/iconv/libiconv/iso8859_2.h
diff --git a/contrib/iconv/libiconv/iso8859_3.h b/aegisub/vendor/iconv/libiconv/iso8859_3.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_3.h
rename to aegisub/vendor/iconv/libiconv/iso8859_3.h
diff --git a/contrib/iconv/libiconv/iso8859_4.h b/aegisub/vendor/iconv/libiconv/iso8859_4.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_4.h
rename to aegisub/vendor/iconv/libiconv/iso8859_4.h
diff --git a/contrib/iconv/libiconv/iso8859_5.h b/aegisub/vendor/iconv/libiconv/iso8859_5.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_5.h
rename to aegisub/vendor/iconv/libiconv/iso8859_5.h
diff --git a/contrib/iconv/libiconv/iso8859_6.h b/aegisub/vendor/iconv/libiconv/iso8859_6.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_6.h
rename to aegisub/vendor/iconv/libiconv/iso8859_6.h
diff --git a/contrib/iconv/libiconv/iso8859_7.h b/aegisub/vendor/iconv/libiconv/iso8859_7.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_7.h
rename to aegisub/vendor/iconv/libiconv/iso8859_7.h
diff --git a/contrib/iconv/libiconv/iso8859_8.h b/aegisub/vendor/iconv/libiconv/iso8859_8.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_8.h
rename to aegisub/vendor/iconv/libiconv/iso8859_8.h
diff --git a/contrib/iconv/libiconv/iso8859_9.h b/aegisub/vendor/iconv/libiconv/iso8859_9.h
similarity index 100%
rename from contrib/iconv/libiconv/iso8859_9.h
rename to aegisub/vendor/iconv/libiconv/iso8859_9.h
diff --git a/contrib/iconv/libiconv/isoir165.h b/aegisub/vendor/iconv/libiconv/isoir165.h
similarity index 100%
rename from contrib/iconv/libiconv/isoir165.h
rename to aegisub/vendor/iconv/libiconv/isoir165.h
diff --git a/contrib/iconv/libiconv/isoir165ext.h b/aegisub/vendor/iconv/libiconv/isoir165ext.h
similarity index 100%
rename from contrib/iconv/libiconv/isoir165ext.h
rename to aegisub/vendor/iconv/libiconv/isoir165ext.h
diff --git a/contrib/iconv/libiconv/java.h b/aegisub/vendor/iconv/libiconv/java.h
similarity index 100%
rename from contrib/iconv/libiconv/java.h
rename to aegisub/vendor/iconv/libiconv/java.h
diff --git a/contrib/iconv/libiconv/jisx0201.h b/aegisub/vendor/iconv/libiconv/jisx0201.h
similarity index 100%
rename from contrib/iconv/libiconv/jisx0201.h
rename to aegisub/vendor/iconv/libiconv/jisx0201.h
diff --git a/contrib/iconv/libiconv/jisx0208.h b/aegisub/vendor/iconv/libiconv/jisx0208.h
similarity index 100%
rename from contrib/iconv/libiconv/jisx0208.h
rename to aegisub/vendor/iconv/libiconv/jisx0208.h
diff --git a/contrib/iconv/libiconv/jisx0212.h b/aegisub/vendor/iconv/libiconv/jisx0212.h
similarity index 100%
rename from contrib/iconv/libiconv/jisx0212.h
rename to aegisub/vendor/iconv/libiconv/jisx0212.h
diff --git a/contrib/iconv/libiconv/jisx0213.h b/aegisub/vendor/iconv/libiconv/jisx0213.h
similarity index 100%
rename from contrib/iconv/libiconv/jisx0213.h
rename to aegisub/vendor/iconv/libiconv/jisx0213.h
diff --git a/contrib/iconv/libiconv/johab.h b/aegisub/vendor/iconv/libiconv/johab.h
similarity index 100%
rename from contrib/iconv/libiconv/johab.h
rename to aegisub/vendor/iconv/libiconv/johab.h
diff --git a/contrib/iconv/libiconv/johab_hangul.h b/aegisub/vendor/iconv/libiconv/johab_hangul.h
similarity index 100%
rename from contrib/iconv/libiconv/johab_hangul.h
rename to aegisub/vendor/iconv/libiconv/johab_hangul.h
diff --git a/contrib/iconv/libiconv/koi8_r.h b/aegisub/vendor/iconv/libiconv/koi8_r.h
similarity index 100%
rename from contrib/iconv/libiconv/koi8_r.h
rename to aegisub/vendor/iconv/libiconv/koi8_r.h
diff --git a/contrib/iconv/libiconv/koi8_ru.h b/aegisub/vendor/iconv/libiconv/koi8_ru.h
similarity index 100%
rename from contrib/iconv/libiconv/koi8_ru.h
rename to aegisub/vendor/iconv/libiconv/koi8_ru.h
diff --git a/contrib/iconv/libiconv/koi8_t.h b/aegisub/vendor/iconv/libiconv/koi8_t.h
similarity index 100%
rename from contrib/iconv/libiconv/koi8_t.h
rename to aegisub/vendor/iconv/libiconv/koi8_t.h
diff --git a/contrib/iconv/libiconv/koi8_u.h b/aegisub/vendor/iconv/libiconv/koi8_u.h
similarity index 100%
rename from contrib/iconv/libiconv/koi8_u.h
rename to aegisub/vendor/iconv/libiconv/koi8_u.h
diff --git a/contrib/iconv/libiconv/ksc5601.h b/aegisub/vendor/iconv/libiconv/ksc5601.h
similarity index 100%
rename from contrib/iconv/libiconv/ksc5601.h
rename to aegisub/vendor/iconv/libiconv/ksc5601.h
diff --git a/contrib/iconv/libiconv/libcharset.h b/aegisub/vendor/iconv/libiconv/libcharset.h
similarity index 100%
rename from contrib/iconv/libiconv/libcharset.h
rename to aegisub/vendor/iconv/libiconv/libcharset.h
diff --git a/contrib/iconv/libiconv/localcharset.h b/aegisub/vendor/iconv/libiconv/localcharset.h
similarity index 100%
rename from contrib/iconv/libiconv/localcharset.h
rename to aegisub/vendor/iconv/libiconv/localcharset.h
diff --git a/contrib/iconv/libiconv/loop_unicode.h b/aegisub/vendor/iconv/libiconv/loop_unicode.h
similarity index 100%
rename from contrib/iconv/libiconv/loop_unicode.h
rename to aegisub/vendor/iconv/libiconv/loop_unicode.h
diff --git a/contrib/iconv/libiconv/loop_wchar.h b/aegisub/vendor/iconv/libiconv/loop_wchar.h
similarity index 100%
rename from contrib/iconv/libiconv/loop_wchar.h
rename to aegisub/vendor/iconv/libiconv/loop_wchar.h
diff --git a/contrib/iconv/libiconv/loops.h b/aegisub/vendor/iconv/libiconv/loops.h
similarity index 100%
rename from contrib/iconv/libiconv/loops.h
rename to aegisub/vendor/iconv/libiconv/loops.h
diff --git a/contrib/iconv/libiconv/mac_arabic.h b/aegisub/vendor/iconv/libiconv/mac_arabic.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_arabic.h
rename to aegisub/vendor/iconv/libiconv/mac_arabic.h
diff --git a/contrib/iconv/libiconv/mac_centraleurope.h b/aegisub/vendor/iconv/libiconv/mac_centraleurope.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_centraleurope.h
rename to aegisub/vendor/iconv/libiconv/mac_centraleurope.h
diff --git a/contrib/iconv/libiconv/mac_croatian.h b/aegisub/vendor/iconv/libiconv/mac_croatian.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_croatian.h
rename to aegisub/vendor/iconv/libiconv/mac_croatian.h
diff --git a/contrib/iconv/libiconv/mac_cyrillic.h b/aegisub/vendor/iconv/libiconv/mac_cyrillic.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_cyrillic.h
rename to aegisub/vendor/iconv/libiconv/mac_cyrillic.h
diff --git a/contrib/iconv/libiconv/mac_greek.h b/aegisub/vendor/iconv/libiconv/mac_greek.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_greek.h
rename to aegisub/vendor/iconv/libiconv/mac_greek.h
diff --git a/contrib/iconv/libiconv/mac_hebrew.h b/aegisub/vendor/iconv/libiconv/mac_hebrew.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_hebrew.h
rename to aegisub/vendor/iconv/libiconv/mac_hebrew.h
diff --git a/contrib/iconv/libiconv/mac_iceland.h b/aegisub/vendor/iconv/libiconv/mac_iceland.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_iceland.h
rename to aegisub/vendor/iconv/libiconv/mac_iceland.h
diff --git a/contrib/iconv/libiconv/mac_roman.h b/aegisub/vendor/iconv/libiconv/mac_roman.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_roman.h
rename to aegisub/vendor/iconv/libiconv/mac_roman.h
diff --git a/contrib/iconv/libiconv/mac_romania.h b/aegisub/vendor/iconv/libiconv/mac_romania.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_romania.h
rename to aegisub/vendor/iconv/libiconv/mac_romania.h
diff --git a/contrib/iconv/libiconv/mac_thai.h b/aegisub/vendor/iconv/libiconv/mac_thai.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_thai.h
rename to aegisub/vendor/iconv/libiconv/mac_thai.h
diff --git a/contrib/iconv/libiconv/mac_turkish.h b/aegisub/vendor/iconv/libiconv/mac_turkish.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_turkish.h
rename to aegisub/vendor/iconv/libiconv/mac_turkish.h
diff --git a/contrib/iconv/libiconv/mac_ukraine.h b/aegisub/vendor/iconv/libiconv/mac_ukraine.h
similarity index 100%
rename from contrib/iconv/libiconv/mac_ukraine.h
rename to aegisub/vendor/iconv/libiconv/mac_ukraine.h
diff --git a/contrib/iconv/libiconv/mulelao.h b/aegisub/vendor/iconv/libiconv/mulelao.h
similarity index 100%
rename from contrib/iconv/libiconv/mulelao.h
rename to aegisub/vendor/iconv/libiconv/mulelao.h
diff --git a/contrib/iconv/libiconv/nextstep.h b/aegisub/vendor/iconv/libiconv/nextstep.h
similarity index 100%
rename from contrib/iconv/libiconv/nextstep.h
rename to aegisub/vendor/iconv/libiconv/nextstep.h
diff --git a/contrib/iconv/libiconv/pt154.h b/aegisub/vendor/iconv/libiconv/pt154.h
similarity index 100%
rename from contrib/iconv/libiconv/pt154.h
rename to aegisub/vendor/iconv/libiconv/pt154.h
diff --git a/contrib/iconv/libiconv/relocatable.c b/aegisub/vendor/iconv/libiconv/relocatable.c
similarity index 100%
rename from contrib/iconv/libiconv/relocatable.c
rename to aegisub/vendor/iconv/libiconv/relocatable.c
diff --git a/contrib/iconv/libiconv/relocatable.h b/aegisub/vendor/iconv/libiconv/relocatable.h
similarity index 100%
rename from contrib/iconv/libiconv/relocatable.h
rename to aegisub/vendor/iconv/libiconv/relocatable.h
diff --git a/contrib/iconv/libiconv/riscos1.h b/aegisub/vendor/iconv/libiconv/riscos1.h
similarity index 100%
rename from contrib/iconv/libiconv/riscos1.h
rename to aegisub/vendor/iconv/libiconv/riscos1.h
diff --git a/contrib/iconv/libiconv/rk1048.h b/aegisub/vendor/iconv/libiconv/rk1048.h
similarity index 100%
rename from contrib/iconv/libiconv/rk1048.h
rename to aegisub/vendor/iconv/libiconv/rk1048.h
diff --git a/contrib/iconv/libiconv/shift_jisx0213.h b/aegisub/vendor/iconv/libiconv/shift_jisx0213.h
similarity index 100%
rename from contrib/iconv/libiconv/shift_jisx0213.h
rename to aegisub/vendor/iconv/libiconv/shift_jisx0213.h
diff --git a/contrib/iconv/libiconv/sjis.h b/aegisub/vendor/iconv/libiconv/sjis.h
similarity index 100%
rename from contrib/iconv/libiconv/sjis.h
rename to aegisub/vendor/iconv/libiconv/sjis.h
diff --git a/contrib/iconv/libiconv/tcvn.h b/aegisub/vendor/iconv/libiconv/tcvn.h
similarity index 100%
rename from contrib/iconv/libiconv/tcvn.h
rename to aegisub/vendor/iconv/libiconv/tcvn.h
diff --git a/contrib/iconv/libiconv/tds565.h b/aegisub/vendor/iconv/libiconv/tds565.h
similarity index 100%
rename from contrib/iconv/libiconv/tds565.h
rename to aegisub/vendor/iconv/libiconv/tds565.h
diff --git a/contrib/iconv/libiconv/tis620.h b/aegisub/vendor/iconv/libiconv/tis620.h
similarity index 100%
rename from contrib/iconv/libiconv/tis620.h
rename to aegisub/vendor/iconv/libiconv/tis620.h
diff --git a/contrib/iconv/libiconv/translit.h b/aegisub/vendor/iconv/libiconv/translit.h
similarity index 100%
rename from contrib/iconv/libiconv/translit.h
rename to aegisub/vendor/iconv/libiconv/translit.h
diff --git a/contrib/iconv/libiconv/ucs2.h b/aegisub/vendor/iconv/libiconv/ucs2.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs2.h
rename to aegisub/vendor/iconv/libiconv/ucs2.h
diff --git a/contrib/iconv/libiconv/ucs2be.h b/aegisub/vendor/iconv/libiconv/ucs2be.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs2be.h
rename to aegisub/vendor/iconv/libiconv/ucs2be.h
diff --git a/contrib/iconv/libiconv/ucs2internal.h b/aegisub/vendor/iconv/libiconv/ucs2internal.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs2internal.h
rename to aegisub/vendor/iconv/libiconv/ucs2internal.h
diff --git a/contrib/iconv/libiconv/ucs2le.h b/aegisub/vendor/iconv/libiconv/ucs2le.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs2le.h
rename to aegisub/vendor/iconv/libiconv/ucs2le.h
diff --git a/contrib/iconv/libiconv/ucs2swapped.h b/aegisub/vendor/iconv/libiconv/ucs2swapped.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs2swapped.h
rename to aegisub/vendor/iconv/libiconv/ucs2swapped.h
diff --git a/contrib/iconv/libiconv/ucs4.h b/aegisub/vendor/iconv/libiconv/ucs4.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs4.h
rename to aegisub/vendor/iconv/libiconv/ucs4.h
diff --git a/contrib/iconv/libiconv/ucs4be.h b/aegisub/vendor/iconv/libiconv/ucs4be.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs4be.h
rename to aegisub/vendor/iconv/libiconv/ucs4be.h
diff --git a/contrib/iconv/libiconv/ucs4internal.h b/aegisub/vendor/iconv/libiconv/ucs4internal.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs4internal.h
rename to aegisub/vendor/iconv/libiconv/ucs4internal.h
diff --git a/contrib/iconv/libiconv/ucs4le.h b/aegisub/vendor/iconv/libiconv/ucs4le.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs4le.h
rename to aegisub/vendor/iconv/libiconv/ucs4le.h
diff --git a/contrib/iconv/libiconv/ucs4swapped.h b/aegisub/vendor/iconv/libiconv/ucs4swapped.h
similarity index 100%
rename from contrib/iconv/libiconv/ucs4swapped.h
rename to aegisub/vendor/iconv/libiconv/ucs4swapped.h
diff --git a/contrib/iconv/libiconv/uhc_1.h b/aegisub/vendor/iconv/libiconv/uhc_1.h
similarity index 100%
rename from contrib/iconv/libiconv/uhc_1.h
rename to aegisub/vendor/iconv/libiconv/uhc_1.h
diff --git a/contrib/iconv/libiconv/uhc_2.h b/aegisub/vendor/iconv/libiconv/uhc_2.h
similarity index 100%
rename from contrib/iconv/libiconv/uhc_2.h
rename to aegisub/vendor/iconv/libiconv/uhc_2.h
diff --git a/contrib/iconv/libiconv/utf16.h b/aegisub/vendor/iconv/libiconv/utf16.h
similarity index 100%
rename from contrib/iconv/libiconv/utf16.h
rename to aegisub/vendor/iconv/libiconv/utf16.h
diff --git a/contrib/iconv/libiconv/utf16be.h b/aegisub/vendor/iconv/libiconv/utf16be.h
similarity index 100%
rename from contrib/iconv/libiconv/utf16be.h
rename to aegisub/vendor/iconv/libiconv/utf16be.h
diff --git a/contrib/iconv/libiconv/utf16le.h b/aegisub/vendor/iconv/libiconv/utf16le.h
similarity index 100%
rename from contrib/iconv/libiconv/utf16le.h
rename to aegisub/vendor/iconv/libiconv/utf16le.h
diff --git a/contrib/iconv/libiconv/utf32.h b/aegisub/vendor/iconv/libiconv/utf32.h
similarity index 100%
rename from contrib/iconv/libiconv/utf32.h
rename to aegisub/vendor/iconv/libiconv/utf32.h
diff --git a/contrib/iconv/libiconv/utf32be.h b/aegisub/vendor/iconv/libiconv/utf32be.h
similarity index 100%
rename from contrib/iconv/libiconv/utf32be.h
rename to aegisub/vendor/iconv/libiconv/utf32be.h
diff --git a/contrib/iconv/libiconv/utf32le.h b/aegisub/vendor/iconv/libiconv/utf32le.h
similarity index 100%
rename from contrib/iconv/libiconv/utf32le.h
rename to aegisub/vendor/iconv/libiconv/utf32le.h
diff --git a/contrib/iconv/libiconv/utf7.h b/aegisub/vendor/iconv/libiconv/utf7.h
similarity index 100%
rename from contrib/iconv/libiconv/utf7.h
rename to aegisub/vendor/iconv/libiconv/utf7.h
diff --git a/contrib/iconv/libiconv/utf8.h b/aegisub/vendor/iconv/libiconv/utf8.h
similarity index 100%
rename from contrib/iconv/libiconv/utf8.h
rename to aegisub/vendor/iconv/libiconv/utf8.h
diff --git a/contrib/iconv/libiconv/vietcomb.h b/aegisub/vendor/iconv/libiconv/vietcomb.h
similarity index 100%
rename from contrib/iconv/libiconv/vietcomb.h
rename to aegisub/vendor/iconv/libiconv/vietcomb.h
diff --git a/contrib/iconv/libiconv/viscii.h b/aegisub/vendor/iconv/libiconv/viscii.h
similarity index 100%
rename from contrib/iconv/libiconv/viscii.h
rename to aegisub/vendor/iconv/libiconv/viscii.h
diff --git a/aegisub/universalchardet/Big5Freq.tab b/aegisub/vendor/universalchardet/Big5Freq.tab
similarity index 100%
rename from aegisub/universalchardet/Big5Freq.tab
rename to aegisub/vendor/universalchardet/Big5Freq.tab
diff --git a/aegisub/universalchardet/CharDistribution.cpp b/aegisub/vendor/universalchardet/CharDistribution.cpp
similarity index 100%
rename from aegisub/universalchardet/CharDistribution.cpp
rename to aegisub/vendor/universalchardet/CharDistribution.cpp
diff --git a/aegisub/universalchardet/CharDistribution.h b/aegisub/vendor/universalchardet/CharDistribution.h
similarity index 100%
rename from aegisub/universalchardet/CharDistribution.h
rename to aegisub/vendor/universalchardet/CharDistribution.h
diff --git a/aegisub/universalchardet/EUCKRFreq.tab b/aegisub/vendor/universalchardet/EUCKRFreq.tab
similarity index 100%
rename from aegisub/universalchardet/EUCKRFreq.tab
rename to aegisub/vendor/universalchardet/EUCKRFreq.tab
diff --git a/aegisub/universalchardet/EUCTWFreq.tab b/aegisub/vendor/universalchardet/EUCTWFreq.tab
similarity index 100%
rename from aegisub/universalchardet/EUCTWFreq.tab
rename to aegisub/vendor/universalchardet/EUCTWFreq.tab
diff --git a/aegisub/universalchardet/GB2312Freq.tab b/aegisub/vendor/universalchardet/GB2312Freq.tab
similarity index 100%
rename from aegisub/universalchardet/GB2312Freq.tab
rename to aegisub/vendor/universalchardet/GB2312Freq.tab
diff --git a/aegisub/universalchardet/JISFreq.tab b/aegisub/vendor/universalchardet/JISFreq.tab
similarity index 100%
rename from aegisub/universalchardet/JISFreq.tab
rename to aegisub/vendor/universalchardet/JISFreq.tab
diff --git a/aegisub/universalchardet/JpCntx.cpp b/aegisub/vendor/universalchardet/JpCntx.cpp
similarity index 100%
rename from aegisub/universalchardet/JpCntx.cpp
rename to aegisub/vendor/universalchardet/JpCntx.cpp
diff --git a/aegisub/universalchardet/JpCntx.h b/aegisub/vendor/universalchardet/JpCntx.h
similarity index 100%
rename from aegisub/universalchardet/JpCntx.h
rename to aegisub/vendor/universalchardet/JpCntx.h
diff --git a/aegisub/universalchardet/LangBulgarianModel.cpp b/aegisub/vendor/universalchardet/LangBulgarianModel.cpp
similarity index 100%
rename from aegisub/universalchardet/LangBulgarianModel.cpp
rename to aegisub/vendor/universalchardet/LangBulgarianModel.cpp
diff --git a/aegisub/universalchardet/LangCyrillicModel.cpp b/aegisub/vendor/universalchardet/LangCyrillicModel.cpp
similarity index 100%
rename from aegisub/universalchardet/LangCyrillicModel.cpp
rename to aegisub/vendor/universalchardet/LangCyrillicModel.cpp
diff --git a/aegisub/universalchardet/LangGreekModel.cpp b/aegisub/vendor/universalchardet/LangGreekModel.cpp
similarity index 100%
rename from aegisub/universalchardet/LangGreekModel.cpp
rename to aegisub/vendor/universalchardet/LangGreekModel.cpp
diff --git a/aegisub/universalchardet/LangHebrewModel.cpp b/aegisub/vendor/universalchardet/LangHebrewModel.cpp
similarity index 100%
rename from aegisub/universalchardet/LangHebrewModel.cpp
rename to aegisub/vendor/universalchardet/LangHebrewModel.cpp
diff --git a/aegisub/universalchardet/LangHungarianModel.cpp b/aegisub/vendor/universalchardet/LangHungarianModel.cpp
similarity index 100%
rename from aegisub/universalchardet/LangHungarianModel.cpp
rename to aegisub/vendor/universalchardet/LangHungarianModel.cpp
diff --git a/aegisub/universalchardet/LangThaiModel.cpp b/aegisub/vendor/universalchardet/LangThaiModel.cpp
similarity index 100%
rename from aegisub/universalchardet/LangThaiModel.cpp
rename to aegisub/vendor/universalchardet/LangThaiModel.cpp
diff --git a/aegisub/universalchardet/Makefile b/aegisub/vendor/universalchardet/Makefile
similarity index 92%
rename from aegisub/universalchardet/Makefile
rename to aegisub/vendor/universalchardet/Makefile
index 802fe26ba..e954a2418 100644
--- a/aegisub/universalchardet/Makefile
+++ b/aegisub/vendor/universalchardet/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.inc
+include ../../Makefile.inc
 
 LIB = libuniversalchardet.a
 
@@ -40,6 +40,6 @@ EXTRA_DIST = \
 	GB2312Freq.tab \
 	JISFreq.tab
 
-include ../Makefile.target
+include ../../Makefile.target
 -include *.d
 
diff --git a/aegisub/universalchardet/md/_aix32.cfg b/aegisub/vendor/universalchardet/md/_aix32.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_aix32.cfg
rename to aegisub/vendor/universalchardet/md/_aix32.cfg
diff --git a/aegisub/universalchardet/md/_aix64.cfg b/aegisub/vendor/universalchardet/md/_aix64.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_aix64.cfg
rename to aegisub/vendor/universalchardet/md/_aix64.cfg
diff --git a/aegisub/universalchardet/md/_beos.cfg b/aegisub/vendor/universalchardet/md/_beos.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_beos.cfg
rename to aegisub/vendor/universalchardet/md/_beos.cfg
diff --git a/aegisub/universalchardet/md/_bsdi.cfg b/aegisub/vendor/universalchardet/md/_bsdi.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_bsdi.cfg
rename to aegisub/vendor/universalchardet/md/_bsdi.cfg
diff --git a/aegisub/universalchardet/md/_darwin.cfg b/aegisub/vendor/universalchardet/md/_darwin.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_darwin.cfg
rename to aegisub/vendor/universalchardet/md/_darwin.cfg
diff --git a/aegisub/universalchardet/md/_dgux.cfg b/aegisub/vendor/universalchardet/md/_dgux.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_dgux.cfg
rename to aegisub/vendor/universalchardet/md/_dgux.cfg
diff --git a/aegisub/universalchardet/md/_freebsd.cfg b/aegisub/vendor/universalchardet/md/_freebsd.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_freebsd.cfg
rename to aegisub/vendor/universalchardet/md/_freebsd.cfg
diff --git a/aegisub/universalchardet/md/_hpux32.cfg b/aegisub/vendor/universalchardet/md/_hpux32.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_hpux32.cfg
rename to aegisub/vendor/universalchardet/md/_hpux32.cfg
diff --git a/aegisub/universalchardet/md/_hpux64.cfg b/aegisub/vendor/universalchardet/md/_hpux64.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_hpux64.cfg
rename to aegisub/vendor/universalchardet/md/_hpux64.cfg
diff --git a/aegisub/universalchardet/md/_irix32.cfg b/aegisub/vendor/universalchardet/md/_irix32.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_irix32.cfg
rename to aegisub/vendor/universalchardet/md/_irix32.cfg
diff --git a/aegisub/universalchardet/md/_irix64.cfg b/aegisub/vendor/universalchardet/md/_irix64.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_irix64.cfg
rename to aegisub/vendor/universalchardet/md/_irix64.cfg
diff --git a/aegisub/universalchardet/md/_linux.cfg b/aegisub/vendor/universalchardet/md/_linux.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_linux.cfg
rename to aegisub/vendor/universalchardet/md/_linux.cfg
diff --git a/aegisub/universalchardet/md/_ncr.cfg b/aegisub/vendor/universalchardet/md/_ncr.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_ncr.cfg
rename to aegisub/vendor/universalchardet/md/_ncr.cfg
diff --git a/aegisub/universalchardet/md/_nec.cfg b/aegisub/vendor/universalchardet/md/_nec.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_nec.cfg
rename to aegisub/vendor/universalchardet/md/_nec.cfg
diff --git a/aegisub/universalchardet/md/_netbsd.cfg b/aegisub/vendor/universalchardet/md/_netbsd.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_netbsd.cfg
rename to aegisub/vendor/universalchardet/md/_netbsd.cfg
diff --git a/aegisub/universalchardet/md/_nextstep.cfg b/aegisub/vendor/universalchardet/md/_nextstep.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_nextstep.cfg
rename to aegisub/vendor/universalchardet/md/_nextstep.cfg
diff --git a/aegisub/universalchardet/md/_nto.cfg b/aegisub/vendor/universalchardet/md/_nto.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_nto.cfg
rename to aegisub/vendor/universalchardet/md/_nto.cfg
diff --git a/aegisub/universalchardet/md/_openbsd.cfg b/aegisub/vendor/universalchardet/md/_openbsd.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_openbsd.cfg
rename to aegisub/vendor/universalchardet/md/_openbsd.cfg
diff --git a/aegisub/universalchardet/md/_openvms.cfg b/aegisub/vendor/universalchardet/md/_openvms.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_openvms.cfg
rename to aegisub/vendor/universalchardet/md/_openvms.cfg
diff --git a/aegisub/universalchardet/md/_os2.cfg b/aegisub/vendor/universalchardet/md/_os2.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_os2.cfg
rename to aegisub/vendor/universalchardet/md/_os2.cfg
diff --git a/aegisub/universalchardet/md/_osf1.cfg b/aegisub/vendor/universalchardet/md/_osf1.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_osf1.cfg
rename to aegisub/vendor/universalchardet/md/_osf1.cfg
diff --git a/aegisub/universalchardet/md/_qnx.cfg b/aegisub/vendor/universalchardet/md/_qnx.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_qnx.cfg
rename to aegisub/vendor/universalchardet/md/_qnx.cfg
diff --git a/aegisub/universalchardet/md/_reliantunix.cfg b/aegisub/vendor/universalchardet/md/_reliantunix.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_reliantunix.cfg
rename to aegisub/vendor/universalchardet/md/_reliantunix.cfg
diff --git a/aegisub/universalchardet/md/_riscos.cfg b/aegisub/vendor/universalchardet/md/_riscos.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_riscos.cfg
rename to aegisub/vendor/universalchardet/md/_riscos.cfg
diff --git a/aegisub/universalchardet/md/_scoos.cfg b/aegisub/vendor/universalchardet/md/_scoos.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_scoos.cfg
rename to aegisub/vendor/universalchardet/md/_scoos.cfg
diff --git a/aegisub/universalchardet/md/_solaris.cfg b/aegisub/vendor/universalchardet/md/_solaris.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_solaris.cfg
rename to aegisub/vendor/universalchardet/md/_solaris.cfg
diff --git a/aegisub/universalchardet/md/_sony.cfg b/aegisub/vendor/universalchardet/md/_sony.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_sony.cfg
rename to aegisub/vendor/universalchardet/md/_sony.cfg
diff --git a/aegisub/universalchardet/md/_sunos4.cfg b/aegisub/vendor/universalchardet/md/_sunos4.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_sunos4.cfg
rename to aegisub/vendor/universalchardet/md/_sunos4.cfg
diff --git a/aegisub/universalchardet/md/_unixware.cfg b/aegisub/vendor/universalchardet/md/_unixware.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_unixware.cfg
rename to aegisub/vendor/universalchardet/md/_unixware.cfg
diff --git a/aegisub/universalchardet/md/_unixware7.cfg b/aegisub/vendor/universalchardet/md/_unixware7.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_unixware7.cfg
rename to aegisub/vendor/universalchardet/md/_unixware7.cfg
diff --git a/aegisub/universalchardet/md/_win16.cfg b/aegisub/vendor/universalchardet/md/_win16.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_win16.cfg
rename to aegisub/vendor/universalchardet/md/_win16.cfg
diff --git a/aegisub/universalchardet/md/_win95.cfg b/aegisub/vendor/universalchardet/md/_win95.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_win95.cfg
rename to aegisub/vendor/universalchardet/md/_win95.cfg
diff --git a/aegisub/universalchardet/md/_winnt.cfg b/aegisub/vendor/universalchardet/md/_winnt.cfg
similarity index 100%
rename from aegisub/universalchardet/md/_winnt.cfg
rename to aegisub/vendor/universalchardet/md/_winnt.cfg
diff --git a/aegisub/universalchardet/nsBig5Prober.cpp b/aegisub/vendor/universalchardet/nsBig5Prober.cpp
similarity index 100%
rename from aegisub/universalchardet/nsBig5Prober.cpp
rename to aegisub/vendor/universalchardet/nsBig5Prober.cpp
diff --git a/aegisub/universalchardet/nsBig5Prober.h b/aegisub/vendor/universalchardet/nsBig5Prober.h
similarity index 100%
rename from aegisub/universalchardet/nsBig5Prober.h
rename to aegisub/vendor/universalchardet/nsBig5Prober.h
diff --git a/aegisub/universalchardet/nsCharSetProber.cpp b/aegisub/vendor/universalchardet/nsCharSetProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsCharSetProber.cpp
rename to aegisub/vendor/universalchardet/nsCharSetProber.cpp
diff --git a/aegisub/universalchardet/nsCharSetProber.h b/aegisub/vendor/universalchardet/nsCharSetProber.h
similarity index 100%
rename from aegisub/universalchardet/nsCharSetProber.h
rename to aegisub/vendor/universalchardet/nsCharSetProber.h
diff --git a/aegisub/universalchardet/nsCodingStateMachine.h b/aegisub/vendor/universalchardet/nsCodingStateMachine.h
similarity index 100%
rename from aegisub/universalchardet/nsCodingStateMachine.h
rename to aegisub/vendor/universalchardet/nsCodingStateMachine.h
diff --git a/aegisub/universalchardet/nsEUCJPProber.cpp b/aegisub/vendor/universalchardet/nsEUCJPProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsEUCJPProber.cpp
rename to aegisub/vendor/universalchardet/nsEUCJPProber.cpp
diff --git a/aegisub/universalchardet/nsEUCJPProber.h b/aegisub/vendor/universalchardet/nsEUCJPProber.h
similarity index 100%
rename from aegisub/universalchardet/nsEUCJPProber.h
rename to aegisub/vendor/universalchardet/nsEUCJPProber.h
diff --git a/aegisub/universalchardet/nsEUCKRProber.cpp b/aegisub/vendor/universalchardet/nsEUCKRProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsEUCKRProber.cpp
rename to aegisub/vendor/universalchardet/nsEUCKRProber.cpp
diff --git a/aegisub/universalchardet/nsEUCKRProber.h b/aegisub/vendor/universalchardet/nsEUCKRProber.h
similarity index 100%
rename from aegisub/universalchardet/nsEUCKRProber.h
rename to aegisub/vendor/universalchardet/nsEUCKRProber.h
diff --git a/aegisub/universalchardet/nsEUCTWProber.cpp b/aegisub/vendor/universalchardet/nsEUCTWProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsEUCTWProber.cpp
rename to aegisub/vendor/universalchardet/nsEUCTWProber.cpp
diff --git a/aegisub/universalchardet/nsEUCTWProber.h b/aegisub/vendor/universalchardet/nsEUCTWProber.h
similarity index 100%
rename from aegisub/universalchardet/nsEUCTWProber.h
rename to aegisub/vendor/universalchardet/nsEUCTWProber.h
diff --git a/aegisub/universalchardet/nsError.h b/aegisub/vendor/universalchardet/nsError.h
similarity index 100%
rename from aegisub/universalchardet/nsError.h
rename to aegisub/vendor/universalchardet/nsError.h
diff --git a/aegisub/universalchardet/nsEscCharsetProber.cpp b/aegisub/vendor/universalchardet/nsEscCharsetProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsEscCharsetProber.cpp
rename to aegisub/vendor/universalchardet/nsEscCharsetProber.cpp
diff --git a/aegisub/universalchardet/nsEscCharsetProber.h b/aegisub/vendor/universalchardet/nsEscCharsetProber.h
similarity index 100%
rename from aegisub/universalchardet/nsEscCharsetProber.h
rename to aegisub/vendor/universalchardet/nsEscCharsetProber.h
diff --git a/aegisub/universalchardet/nsEscSM.cpp b/aegisub/vendor/universalchardet/nsEscSM.cpp
similarity index 100%
rename from aegisub/universalchardet/nsEscSM.cpp
rename to aegisub/vendor/universalchardet/nsEscSM.cpp
diff --git a/aegisub/universalchardet/nsGB2312Prober.cpp b/aegisub/vendor/universalchardet/nsGB2312Prober.cpp
similarity index 100%
rename from aegisub/universalchardet/nsGB2312Prober.cpp
rename to aegisub/vendor/universalchardet/nsGB2312Prober.cpp
diff --git a/aegisub/universalchardet/nsGB2312Prober.h b/aegisub/vendor/universalchardet/nsGB2312Prober.h
similarity index 100%
rename from aegisub/universalchardet/nsGB2312Prober.h
rename to aegisub/vendor/universalchardet/nsGB2312Prober.h
diff --git a/aegisub/universalchardet/nsHebrewProber.cpp b/aegisub/vendor/universalchardet/nsHebrewProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsHebrewProber.cpp
rename to aegisub/vendor/universalchardet/nsHebrewProber.cpp
diff --git a/aegisub/universalchardet/nsHebrewProber.h b/aegisub/vendor/universalchardet/nsHebrewProber.h
similarity index 100%
rename from aegisub/universalchardet/nsHebrewProber.h
rename to aegisub/vendor/universalchardet/nsHebrewProber.h
diff --git a/aegisub/universalchardet/nsLatin1Prober.cpp b/aegisub/vendor/universalchardet/nsLatin1Prober.cpp
similarity index 100%
rename from aegisub/universalchardet/nsLatin1Prober.cpp
rename to aegisub/vendor/universalchardet/nsLatin1Prober.cpp
diff --git a/aegisub/universalchardet/nsLatin1Prober.h b/aegisub/vendor/universalchardet/nsLatin1Prober.h
similarity index 100%
rename from aegisub/universalchardet/nsLatin1Prober.h
rename to aegisub/vendor/universalchardet/nsLatin1Prober.h
diff --git a/aegisub/universalchardet/nsMBCSGroupProber.cpp b/aegisub/vendor/universalchardet/nsMBCSGroupProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsMBCSGroupProber.cpp
rename to aegisub/vendor/universalchardet/nsMBCSGroupProber.cpp
diff --git a/aegisub/universalchardet/nsMBCSGroupProber.h b/aegisub/vendor/universalchardet/nsMBCSGroupProber.h
similarity index 100%
rename from aegisub/universalchardet/nsMBCSGroupProber.h
rename to aegisub/vendor/universalchardet/nsMBCSGroupProber.h
diff --git a/aegisub/universalchardet/nsMBCSSM.cpp b/aegisub/vendor/universalchardet/nsMBCSSM.cpp
similarity index 100%
rename from aegisub/universalchardet/nsMBCSSM.cpp
rename to aegisub/vendor/universalchardet/nsMBCSSM.cpp
diff --git a/aegisub/universalchardet/nsPkgInt.h b/aegisub/vendor/universalchardet/nsPkgInt.h
similarity index 100%
rename from aegisub/universalchardet/nsPkgInt.h
rename to aegisub/vendor/universalchardet/nsPkgInt.h
diff --git a/aegisub/universalchardet/nsSBCSGroupProber.cpp b/aegisub/vendor/universalchardet/nsSBCSGroupProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsSBCSGroupProber.cpp
rename to aegisub/vendor/universalchardet/nsSBCSGroupProber.cpp
diff --git a/aegisub/universalchardet/nsSBCSGroupProber.h b/aegisub/vendor/universalchardet/nsSBCSGroupProber.h
similarity index 100%
rename from aegisub/universalchardet/nsSBCSGroupProber.h
rename to aegisub/vendor/universalchardet/nsSBCSGroupProber.h
diff --git a/aegisub/universalchardet/nsSBCharSetProber.cpp b/aegisub/vendor/universalchardet/nsSBCharSetProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsSBCharSetProber.cpp
rename to aegisub/vendor/universalchardet/nsSBCharSetProber.cpp
diff --git a/aegisub/universalchardet/nsSBCharSetProber.h b/aegisub/vendor/universalchardet/nsSBCharSetProber.h
similarity index 100%
rename from aegisub/universalchardet/nsSBCharSetProber.h
rename to aegisub/vendor/universalchardet/nsSBCharSetProber.h
diff --git a/aegisub/universalchardet/nsSJISProber.cpp b/aegisub/vendor/universalchardet/nsSJISProber.cpp
similarity index 100%
rename from aegisub/universalchardet/nsSJISProber.cpp
rename to aegisub/vendor/universalchardet/nsSJISProber.cpp
diff --git a/aegisub/universalchardet/nsSJISProber.h b/aegisub/vendor/universalchardet/nsSJISProber.h
similarity index 100%
rename from aegisub/universalchardet/nsSJISProber.h
rename to aegisub/vendor/universalchardet/nsSJISProber.h
diff --git a/aegisub/universalchardet/nsUTF8Prober.cpp b/aegisub/vendor/universalchardet/nsUTF8Prober.cpp
similarity index 100%
rename from aegisub/universalchardet/nsUTF8Prober.cpp
rename to aegisub/vendor/universalchardet/nsUTF8Prober.cpp
diff --git a/aegisub/universalchardet/nsUTF8Prober.h b/aegisub/vendor/universalchardet/nsUTF8Prober.h
similarity index 100%
rename from aegisub/universalchardet/nsUTF8Prober.h
rename to aegisub/vendor/universalchardet/nsUTF8Prober.h
diff --git a/aegisub/universalchardet/nsUniversalDetector.cpp b/aegisub/vendor/universalchardet/nsUniversalDetector.cpp
similarity index 100%
rename from aegisub/universalchardet/nsUniversalDetector.cpp
rename to aegisub/vendor/universalchardet/nsUniversalDetector.cpp
diff --git a/aegisub/universalchardet/nsUniversalDetector.h b/aegisub/vendor/universalchardet/nsUniversalDetector.h
similarity index 100%
rename from aegisub/universalchardet/nsUniversalDetector.h
rename to aegisub/vendor/universalchardet/nsUniversalDetector.h
diff --git a/aegisub/universalchardet/nscore.h b/aegisub/vendor/universalchardet/nscore.h
similarity index 100%
rename from aegisub/universalchardet/nscore.h
rename to aegisub/vendor/universalchardet/nscore.h
diff --git a/aegisub/universalchardet/prcpucfg.h b/aegisub/vendor/universalchardet/prcpucfg.h
similarity index 100%
rename from aegisub/universalchardet/prcpucfg.h
rename to aegisub/vendor/universalchardet/prcpucfg.h
diff --git a/aegisub/universalchardet/prmem.h b/aegisub/vendor/universalchardet/prmem.h
similarity index 100%
rename from aegisub/universalchardet/prmem.h
rename to aegisub/vendor/universalchardet/prmem.h
diff --git a/aegisub/universalchardet/protypes.h b/aegisub/vendor/universalchardet/protypes.h
similarity index 100%
rename from aegisub/universalchardet/protypes.h
rename to aegisub/vendor/universalchardet/protypes.h
diff --git a/aegisub/universalchardet/prtypes.h b/aegisub/vendor/universalchardet/prtypes.h
similarity index 100%
rename from aegisub/universalchardet/prtypes.h
rename to aegisub/vendor/universalchardet/prtypes.h
diff --git a/aegisub/universalchardet/xpcom-config.h b/aegisub/vendor/universalchardet/xpcom-config.h
similarity index 100%
rename from aegisub/universalchardet/xpcom-config.h
rename to aegisub/vendor/universalchardet/xpcom-config.h