diff --git a/vendor/csri/Doxyfile b/subprojects/csri/Doxyfile
similarity index 100%
rename from vendor/csri/Doxyfile
rename to subprojects/csri/Doxyfile
diff --git a/vendor/csri/LICENSE b/subprojects/csri/LICENSE
similarity index 100%
rename from vendor/csri/LICENSE
rename to subprojects/csri/LICENSE
diff --git a/vendor/csri/Makefile.am b/subprojects/csri/Makefile.am
similarity index 100%
rename from vendor/csri/Makefile.am
rename to subprojects/csri/Makefile.am
diff --git a/vendor/csri/ac/Makefile.am b/subprojects/csri/ac/Makefile.am
similarity index 100%
rename from vendor/csri/ac/Makefile.am
rename to subprojects/csri/ac/Makefile.am
diff --git a/vendor/csri/acinclude.m4 b/subprojects/csri/acinclude.m4
similarity index 100%
rename from vendor/csri/acinclude.m4
rename to subprojects/csri/acinclude.m4
diff --git a/vendor/csri/backends/Makefile.am b/subprojects/csri/backends/Makefile.am
similarity index 100%
rename from vendor/csri/backends/Makefile.am
rename to subprojects/csri/backends/Makefile.am
diff --git a/vendor/csri/backends/libass/Makefile.am b/subprojects/csri/backends/libass/Makefile.am
similarity index 100%
rename from vendor/csri/backends/libass/Makefile.am
rename to subprojects/csri/backends/libass/Makefile.am
diff --git a/vendor/csri/backends/libass/libass_csri.c b/subprojects/csri/backends/libass/libass_csri.c
similarity index 100%
rename from vendor/csri/backends/libass/libass_csri.c
rename to subprojects/csri/backends/libass/libass_csri.c
diff --git a/vendor/csri/bootstrap b/subprojects/csri/bootstrap
old mode 100755
new mode 100644
similarity index 100%
rename from vendor/csri/bootstrap
rename to subprojects/csri/bootstrap
diff --git a/vendor/csri/configure.ac b/subprojects/csri/configure.ac
similarity index 100%
rename from vendor/csri/configure.ac
rename to subprojects/csri/configure.ac
diff --git a/vendor/csri/csri.pc.in b/subprojects/csri/csri.pc.in
similarity index 100%
rename from vendor/csri/csri.pc.in
rename to subprojects/csri/csri.pc.in
diff --git a/vendor/csri/csri_2008.vcproj b/subprojects/csri/csri_2008.vcproj
similarity index 100%
rename from vendor/csri/csri_2008.vcproj
rename to subprojects/csri/csri_2008.vcproj
diff --git a/vendor/csri/frontends/Makefile.am b/subprojects/csri/frontends/Makefile.am
similarity index 100%
rename from vendor/csri/frontends/Makefile.am
rename to subprojects/csri/frontends/Makefile.am
diff --git a/vendor/csri/frontends/avisynth25/Makefile.am b/subprojects/csri/frontends/avisynth25/Makefile.am
similarity index 100%
rename from vendor/csri/frontends/avisynth25/Makefile.am
rename to subprojects/csri/frontends/avisynth25/Makefile.am
diff --git a/vendor/csri/frontends/avisynth25/avisynth.cpp b/subprojects/csri/frontends/avisynth25/avisynth.cpp
similarity index 100%
rename from vendor/csri/frontends/avisynth25/avisynth.cpp
rename to subprojects/csri/frontends/avisynth25/avisynth.cpp
diff --git a/vendor/csri/frontends/avisynth25/avisynth.h b/subprojects/csri/frontends/avisynth25/avisynth.h
similarity index 100%
rename from vendor/csri/frontends/avisynth25/avisynth.h
rename to subprojects/csri/frontends/avisynth25/avisynth.h
diff --git a/vendor/csri/frontends/cmdline/Makefile.am b/subprojects/csri/frontends/cmdline/Makefile.am
similarity index 100%
rename from vendor/csri/frontends/cmdline/Makefile.am
rename to subprojects/csri/frontends/cmdline/Makefile.am
diff --git a/vendor/csri/frontends/cmdline/cmdmain.c b/subprojects/csri/frontends/cmdline/cmdmain.c
similarity index 100%
rename from vendor/csri/frontends/cmdline/cmdmain.c
rename to subprojects/csri/frontends/cmdline/cmdmain.c
diff --git a/vendor/csri/frontends/cmdline/render.c b/subprojects/csri/frontends/cmdline/render.c
similarity index 100%
rename from vendor/csri/frontends/cmdline/render.c
rename to subprojects/csri/frontends/cmdline/render.c
diff --git a/vendor/csri/frontends/cmdline/render.h b/subprojects/csri/frontends/cmdline/render.h
similarity index 100%
rename from vendor/csri/frontends/cmdline/render.h
rename to subprojects/csri/frontends/cmdline/render.h
diff --git a/vendor/csri/include/Makefile.am b/subprojects/csri/include/Makefile.am
similarity index 100%
rename from vendor/csri/include/Makefile.am
rename to subprojects/csri/include/Makefile.am
diff --git a/vendor/csri/include/csri/csri.h b/subprojects/csri/include/csri/csri.h
similarity index 100%
rename from vendor/csri/include/csri/csri.h
rename to subprojects/csri/include/csri/csri.h
diff --git a/vendor/csri/include/csri/fmtids.h b/subprojects/csri/include/csri/fmtids.h
similarity index 100%
rename from vendor/csri/include/csri/fmtids.h
rename to subprojects/csri/include/csri/fmtids.h
diff --git a/vendor/csri/include/csri/logging.h b/subprojects/csri/include/csri/logging.h
similarity index 100%
rename from vendor/csri/include/csri/logging.h
rename to subprojects/csri/include/csri/logging.h
diff --git a/vendor/csri/include/csri/openerr.h b/subprojects/csri/include/csri/openerr.h
similarity index 100%
rename from vendor/csri/include/csri/openerr.h
rename to subprojects/csri/include/csri/openerr.h
diff --git a/vendor/csri/include/csri/stream.h b/subprojects/csri/include/csri/stream.h
similarity index 100%
rename from vendor/csri/include/csri/stream.h
rename to subprojects/csri/include/csri/stream.h
diff --git a/vendor/csri/include/subhelp.h b/subprojects/csri/include/subhelp.h
similarity index 100%
rename from vendor/csri/include/subhelp.h
rename to subprojects/csri/include/subhelp.h
diff --git a/vendor/csri/include/visibility.h b/subprojects/csri/include/visibility.h
similarity index 100%
rename from vendor/csri/include/visibility.h
rename to subprojects/csri/include/visibility.h
diff --git a/vendor/csri/lib/Makefile.am b/subprojects/csri/lib/Makefile.am
similarity index 100%
rename from vendor/csri/lib/Makefile.am
rename to subprojects/csri/lib/Makefile.am
diff --git a/vendor/csri/lib/csrilib.h b/subprojects/csri/lib/csrilib.h
similarity index 100%
rename from vendor/csri/lib/csrilib.h
rename to subprojects/csri/lib/csrilib.h
diff --git a/vendor/csri/lib/list.c b/subprojects/csri/lib/list.c
similarity index 100%
rename from vendor/csri/lib/list.c
rename to subprojects/csri/lib/list.c
diff --git a/vendor/csri/lib/posix/csrilib_os.h b/subprojects/csri/lib/posix/csrilib_os.h
similarity index 100%
rename from vendor/csri/lib/posix/csrilib_os.h
rename to subprojects/csri/lib/posix/csrilib_os.h
diff --git a/vendor/csri/lib/posix/enumerate.c b/subprojects/csri/lib/posix/enumerate.c
similarity index 100%
rename from vendor/csri/lib/posix/enumerate.c
rename to subprojects/csri/lib/posix/enumerate.c
diff --git a/vendor/csri/lib/win32/csrilib_os.h b/subprojects/csri/lib/win32/csrilib_os.h
similarity index 100%
rename from vendor/csri/lib/win32/csrilib_os.h
rename to subprojects/csri/lib/win32/csrilib_os.h
diff --git a/vendor/csri/lib/win32/enumerate.c b/subprojects/csri/lib/win32/enumerate.c
similarity index 100%
rename from vendor/csri/lib/win32/enumerate.c
rename to subprojects/csri/lib/win32/enumerate.c
diff --git a/vendor/csri/lib/wrap.c b/subprojects/csri/lib/wrap.c
similarity index 100%
rename from vendor/csri/lib/wrap.c
rename to subprojects/csri/lib/wrap.c
diff --git a/vendor/csri/subhelp/Makefile.am b/subprojects/csri/subhelp/Makefile.am
similarity index 100%
rename from vendor/csri/subhelp/Makefile.am
rename to subprojects/csri/subhelp/Makefile.am
diff --git a/vendor/csri/subhelp/logging.c b/subprojects/csri/subhelp/logging.c
similarity index 100%
rename from vendor/csri/subhelp/logging.c
rename to subprojects/csri/subhelp/logging.c
diff --git a/vendor/csri/subhelp/posix/openfile.c b/subprojects/csri/subhelp/posix/openfile.c
similarity index 100%
rename from vendor/csri/subhelp/posix/openfile.c
rename to subprojects/csri/subhelp/posix/openfile.c
diff --git a/vendor/csri/subhelp/win32/openfile.c b/subprojects/csri/subhelp/win32/openfile.c
similarity index 100%
rename from vendor/csri/subhelp/win32/openfile.c
rename to subprojects/csri/subhelp/win32/openfile.c