diff --git a/.gitignore b/.gitignore
index 5d9752c3e..1a3b6110f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,49 +34,44 @@
*.zip
*~
-bin
-lib
-obj
-ipch
+/bin
+/include
+/ipch
+/lib
+/obj
+/tests/data
.lvimrc
.syntastic_cpp_config
+/Makefile.inc
BuildLog.htm
-Makefile.inc
acconf.h
acconf.h.in
aclocal.m4
-aegisub/conf.sh
-aegisub/desktop/aegisub.desktop
-aegisub/desktop/aegisub.desktop.template
-aegisub/libaegisub/libaegisub-3.0.so.3
-aegisub/reporter/reporter-3.0
-aegisub/src/aegisub
-aegisub/src/aegisub-3.0
-aegisub/src/libresrc/bitmap.cpp
-aegisub/src/libresrc/bitmap.h
-aegisub/src/libresrc/default_config.cpp
-aegisub/src/libresrc/default_config.h
-aegisub/src/libresrc/default_config_platform.json
-aegisub/tools/common-respack
-aegisub/tools/repack-thes-dict
-aegisub/tools/repack-thes-dict.dSYM
-aegisub/tools/osx-bundle-restart-helper
-aegisub/tools/osx-bundle.sed
autom4te.cache
+conf.sh
config.log
config.status
config_windows.h
configure
-svn-revision.h
-svn_revision
-svnmove.txt
+desktop/aegisub.desktop
+desktop/aegisub.desktop.template
git_version.h
git_version.xml
-aegisub/tests/data
-aegisub/tests/run
-aegisub/tests/*.json
+src/aegisub
+src/libresrc/bitmap.cpp
+src/libresrc/bitmap.h
+src/libresrc/default_config.cpp
+src/libresrc/default_config.h
+src/libresrc/default_config_platform.json
+svn-revision.h
+svn_revision
+tests/*.json
+tests/run
+tools/common-respack
+tools/osx-bundle-restart-helper
+tools/osx-bundle.sed
+tools/repack-thes-dict
+tools/repack-thes-dict.dSYM
-/packages
.nuget
-/aegisub/include
diff --git a/.gitmodules b/.gitmodules
index 4032d9dc6..6f5714495 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,56 +1,56 @@
[submodule "aegisub/vendor/fribidi"]
- path = aegisub/vendor/fribidi
+ path = vendor/fribidi
url = git://anongit.freedesktop.org/fribidi/fribidi
ignore = dirty
[submodule "aegisub/vendor/freetype2"]
- path = aegisub/vendor/freetype2
+ path = vendor/freetype2
url = git://git.sv.nongnu.org/freetype/freetype2.git
ignore = dirty
[submodule "aegisub/vendor/zlib"]
- path = aegisub/vendor/zlib
+ path = vendor/zlib
url = git://github.com/madler/zlib.git
ignore = dirty
[submodule "aegisub/vendor/wxWidgets"]
- path = aegisub/vendor/wxWidgets
+ path = vendor/wxWidgets
url = git://github.com/wxWidgets/wxWidgets.git
ignore = dirty
[submodule "aegisub/vendor/googletest"]
- path = aegisub/vendor/googletest
+ path = vendor/googletest
url = git://github.com/svn2github/googletest.git
ignore = dirty
[submodule "aegisub/vendor/ffmpeg"]
- path = aegisub/vendor/ffmpeg
+ path = vendor/ffmpeg
url = git://source.ffmpeg.org/ffmpeg.git
ignore = dirty
[submodule "aegisub/vendor/ffms2"]
- path = aegisub/vendor/ffms2
+ path = vendor/ffms2
url = git://github.com/FFMS/ffms2.git
branch = master
ignore = dirty
[submodule "aegisub/vendor/fontconfig"]
- path = aegisub/vendor/fontconfig
+ path = vendor/fontconfig
url = git://github.com/tgoyne/fontconfig.git
branch = msvc
ignore = dirty
[submodule "aegisub/vendor/libass"]
- path = aegisub/vendor/libass
+ path = vendor/libass
url = git://github.com/libass/libass.git
branch = master
[submodule "aegisub/vendor/icu"]
- path = aegisub/vendor/icu
+ path = vendor/icu
url = git://github.com/sillsdev/icu4c.git
branch = trunk
ignore = dirty
[submodule "aegisub/vendor/boost"]
- path = aegisub/vendor/boost
+ path = vendor/boost
url = https://github.com/boostorg/boost.git
ignore = dirty
[submodule "aegisub/vendor/lua"]
- path = aegisub/vendor/lua
+ path = vendor/lua
url = git://github.com/ittner/Lua-experimentation.git
branch = lua51
ignore = dirty
[submodule "aegisub/vendor/fftw"]
- path = aegisub/vendor/fftw
+ path = vendor/fftw
url = https://github.com/Aegisub/fftw3.git
ignore = dirty
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
index 6a318ad9b..25dfbe7ab 100644
--- a/.nuget/NuGet.Config
+++ b/.nuget/NuGet.Config
@@ -3,4 +3,7 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/Aegisub.sln b/Aegisub.sln
index 3a431bf47..c96702b84 100644
--- a/Aegisub.sln
+++ b/Aegisub.sln
@@ -2,56 +2,56 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aegisub", "aegisub\build\Aegisub\Aegisub.vcxproj", "{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aegisub", "build\Aegisub\Aegisub.vcxproj", "{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}"
ProjectSection(ProjectDependencies) = postProject
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csrihelper", "aegisub\build\csrihelper\csrihelper.vcxproj", "{C832EAF3-860D-4373-A02C-933626B47A5E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csrihelper", "build\csrihelper\csrihelper.vcxproj", "{C832EAF3-860D-4373-A02C-933626B47A5E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "aegisub\build\hunspell\hunspell.vcxproj", "{CC791693-6B28-40AC-879D-64A6C16468E3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "build\hunspell\hunspell.vcxproj", "{CC791693-6B28-40AC-879D-64A6C16468E3}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaegisub", "aegisub\build\libaegisub\libaegisub.vcxproj", "{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaegisub", "build\libaegisub\libaegisub.vcxproj", "{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "aegisub\build\libiconv\libiconv.vcxproj", "{965054D2-44F2-4EB2-9879-051CC3D7EF08}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "build\libiconv\libiconv.vcxproj", "{965054D2-44F2-4EB2-9879-051CC3D7EF08}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresrc", "aegisub\build\libresrc\libresrc.vcxproj", "{BD00D65F-24DA-4784-8860-3B972EA125FC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresrc", "build\libresrc\libresrc.vcxproj", "{BD00D65F-24DA-4784-8860-3B972EA125FC}"
ProjectSection(ProjectDependencies) = postProject
{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC} = {0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}
{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8} = {08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "aegisub\build\lua51\lua51.vcxproj", "{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "build\lua51\lua51.vcxproj", "{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "respack", "aegisub\build\respack\respack.vcxproj", "{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "respack", "build\respack\respack.vcxproj", "{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "universalchardet", "aegisub\build\universalchardet\universalchardet.vcxproj", "{7B56955D-5162-4698-AA5B-47484EDC8783}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "universalchardet", "build\universalchardet\universalchardet.vcxproj", "{7B56955D-5162-4698-AA5B-47484EDC8783}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fftw", "aegisub\build\fftw\fftw.vcxproj", "{EA3DCC95-2423-4EA0-A508-7A427B4C0594}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fftw", "build\fftw\fftw.vcxproj", "{EA3DCC95-2423-4EA0-A508-7A427B4C0594}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "aegisub\build\freetype2\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "build\freetype2\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fontconfig", "aegisub\build\fontconfig\fontconfig.vcxproj", "{AD56899E-961B-47B7-BD0F-14D0DA50D141}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fontconfig", "build\fontconfig\fontconfig.vcxproj", "{AD56899E-961B-47B7-BD0F-14D0DA50D141}"
ProjectSection(ProjectDependencies) = postProject
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fribidi", "aegisub\build\fribidi\fribidi.vcxproj", "{FB8E8D19-A4D6-4181-943C-282075F49B41}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fribidi", "build\fribidi\fribidi.vcxproj", "{FB8E8D19-A4D6-4181-943C-282075F49B41}"
ProjectSection(ProjectDependencies) = postProject
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffms2", "aegisub\build\ffms2\ffms2.vcxproj", "{AA137613-96A1-4388-8905-71345B4F8F87}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffms2", "build\ffms2\ffms2.vcxproj", "{AA137613-96A1-4388-8905-71345B4F8F87}"
ProjectSection(ProjectDependencies) = postProject
{F934AB7B-186B-4E96-B20C-A58C38C1B819} = {F934AB7B-186B-4E96-B20C-A58C38C1B819}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "aegisub\build\ffmpeg\ffmpeg.vcxproj", "{F934AB7B-186B-4E96-B20C-A58C38C1B819}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "build\ffmpeg\ffmpeg.vcxproj", "{F934AB7B-186B-4E96-B20C-A58C38C1B819}"
ProjectSection(ProjectDependencies) = postProject
{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE} = {10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "aegisub\build\zlib\zlib.vcxproj", "{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "build\zlib\zlib.vcxproj", "{10F22A5A-DD9E-44A1-BA2E-2A9A7C78B0EE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CEAEFCB9-3759-4D03-8D51-7287D7B7E7DF}"
ProjectSection(SolutionItems) = preProject
@@ -60,27 +60,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CEAEFC
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "aegisub\build\wx\wxWidgets.vcxproj", "{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "build\wx\wxWidgets.vcxproj", "{0518D6C0-7BF6-4FD1-91FB-191BD10DB2AC}"
ProjectSection(ProjectDependencies) = postProject
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libass", "aegisub\build\libass\libass.vcxproj", "{8804F253-DA67-4CC4-926B-0CD2AEE5778D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libass", "build\libass\libass.vcxproj", "{8804F253-DA67-4CC4-926B-0CD2AEE5778D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PortableInstaller", "aegisub\build\PortableInstaller\PortableInstaller.vcxproj", "{5B0E9978-E76F-4BBC-8194-228323F59B53}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PortableInstaller", "build\PortableInstaller\PortableInstaller.vcxproj", "{5B0E9978-E76F-4BBC-8194-228323F59B53}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost", "aegisub\build\boost\boost.vcxproj", "{A649D828-A399-4D81-ADEF-94CFDBA7847F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost", "build\boost\boost.vcxproj", "{A649D828-A399-4D81-ADEF-94CFDBA7847F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "aegisub\build\icu\icu.vcxproj", "{F934AB7B-186B-4E96-B20C-A58C38C1B818}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "build\icu\icu.vcxproj", "{F934AB7B-186B-4E96-B20C-A58C38C1B818}"
ProjectSection(ProjectDependencies) = postProject
{914A5B35-66B2-4293-BB6C-D93DA9BC68C6} = {914A5B35-66B2-4293-BB6C-D93DA9BC68C6}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googletest", "aegisub\build\googletest\googletest.vcxproj", "{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googletest", "build\googletest\googletest.vcxproj", "{FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "aegisub\build\tests\tests.vcxproj", "{49766286-2B5D-4177-A860-BD7CE1846EEF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "build\tests\tests.vcxproj", "{49766286-2B5D-4177-A860-BD7CE1846EEF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTasks", "aegisub\build\BuildTasks\BuildTasks.csproj", "{914A5B35-66B2-4293-BB6C-D93DA9BC68C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildTasks", "build\BuildTasks\BuildTasks.csproj", "{914A5B35-66B2-4293-BB6C-D93DA9BC68C6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/aegisub/LICENCE b/LICENCE
similarity index 100%
rename from aegisub/LICENCE
rename to LICENCE
diff --git a/aegisub/Makefile b/Makefile
similarity index 100%
rename from aegisub/Makefile
rename to Makefile
diff --git a/aegisub/Makefile.inc.in b/Makefile.inc.in
similarity index 100%
rename from aegisub/Makefile.inc.in
rename to Makefile.inc.in
diff --git a/aegisub/Makefile.target b/Makefile.target
similarity index 100%
rename from aegisub/Makefile.target
rename to Makefile.target
diff --git a/README.md b/README.md
index 9533aa7bf..2f074a509 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Support is available on [the forums](http://forum.aegisub.org) or [on IRC](irc:/
Prerequisites:
-1. Visual Studio 2012. Express edition might work.
+1. Visual Studio 2013. Express edition might work.
2. A recent Windows SDK
3. A recent DirectX SDK
4. A MSYS install with git and c99conv. Note that mingw is not required.
@@ -28,14 +28,14 @@ All other dependencies are either stored in the repository or are included as su
Building:
1. Clone Aegisub's repository recursively to fetch it and all submodules: `git clone --recursive git@github.com:Aegisub/Aegisub.git`
-2. Disable autocrlf for ffmpeg, as its build system manages to not support Windows newlines: `cd aegisub/deps/ffmpeg && git config --local core.autocrlf && git rm --cached -r . && git reset --hard`
+2. Disable autocrlf for ffmpeg, as its build system manages to not support Windows newlines: `cd vendor/ffmpeg && git config --local core.autocrlf && git rm --cached -r . && git reset --hard`
3. Open Visual Studio from the VS2013 Native Tools Command Promp using devenv.exe /useenv (required for the build system to be able to find nmake.exe for building wxWidgets)
4. Open Aegisub.sln
5. Open the properties for the Aegisub project and set the location of MSYS in Configuration Properties > Aegisub > Library paths
6. Build Aegisub
7. Copy the contents of an existing Aegisub install into the aegisub/aegisub/bin directory (not strictly required, but you'll be missing a lot of functionality otherwise).
-There's a pile of other files such as dictionaries, VSFilter and avisynth
+There's a pile of other files needed at runtime such as dictionaries, VSFilter and avisynth. The simplest way to get them is to copy all of the files from the Aegisub installer to the bin directory.
For actual development work you will probably want to mostly use the
"Debug-MinDep" configuration (which disables building most of the projects), as
diff --git a/aegisub/acinclude.m4 b/acinclude.m4
similarity index 100%
rename from aegisub/acinclude.m4
rename to acinclude.m4
diff --git a/aegisub/autogen.sh b/autogen.sh
similarity index 100%
rename from aegisub/autogen.sh
rename to autogen.sh
diff --git a/aegisub/automation/.gitignore b/automation/.gitignore
similarity index 100%
rename from aegisub/automation/.gitignore
rename to automation/.gitignore
diff --git a/aegisub/automation/Makefile b/automation/Makefile
similarity index 100%
rename from aegisub/automation/Makefile
rename to automation/Makefile
diff --git a/aegisub/automation/autoload/clean-info.lua b/automation/autoload/clean-info.lua
similarity index 100%
rename from aegisub/automation/autoload/clean-info.lua
rename to automation/autoload/clean-info.lua
diff --git a/aegisub/automation/autoload/cleantags-autoload.lua b/automation/autoload/cleantags-autoload.lua
similarity index 100%
rename from aegisub/automation/autoload/cleantags-autoload.lua
rename to automation/autoload/cleantags-autoload.lua
diff --git a/aegisub/automation/autoload/kara-templater.lua b/automation/autoload/kara-templater.lua
similarity index 100%
rename from aegisub/automation/autoload/kara-templater.lua
rename to automation/autoload/kara-templater.lua
diff --git a/aegisub/automation/autoload/karaoke-auto-leadin.lua b/automation/autoload/karaoke-auto-leadin.lua
similarity index 100%
rename from aegisub/automation/autoload/karaoke-auto-leadin.lua
rename to automation/autoload/karaoke-auto-leadin.lua
diff --git a/aegisub/automation/autoload/macro-1-edgeblur.lua b/automation/autoload/macro-1-edgeblur.lua
similarity index 100%
rename from aegisub/automation/autoload/macro-1-edgeblur.lua
rename to automation/autoload/macro-1-edgeblur.lua
diff --git a/aegisub/automation/autoload/macro-2-mkfullwitdh.lua b/automation/autoload/macro-2-mkfullwitdh.lua
similarity index 100%
rename from aegisub/automation/autoload/macro-2-mkfullwitdh.lua
rename to automation/autoload/macro-2-mkfullwitdh.lua
diff --git a/aegisub/automation/autoload/select-overlaps.moon b/automation/autoload/select-overlaps.moon
similarity index 100%
rename from aegisub/automation/autoload/select-overlaps.moon
rename to automation/autoload/select-overlaps.moon
diff --git a/aegisub/automation/autoload/strip-tags.lua b/automation/autoload/strip-tags.lua
similarity index 100%
rename from aegisub/automation/autoload/strip-tags.lua
rename to automation/autoload/strip-tags.lua
diff --git a/aegisub/automation/demos/future-windy-blur.lua b/automation/demos/future-windy-blur.lua
similarity index 100%
rename from aegisub/automation/demos/future-windy-blur.lua
rename to automation/demos/future-windy-blur.lua
diff --git a/aegisub/automation/demos/raytracer-test1.ass b/automation/demos/raytracer-test1.ass
similarity index 100%
rename from aegisub/automation/demos/raytracer-test1.ass
rename to automation/demos/raytracer-test1.ass
diff --git a/aegisub/automation/demos/raytracer.lua b/automation/demos/raytracer.lua
similarity index 100%
rename from aegisub/automation/demos/raytracer.lua
rename to automation/demos/raytracer.lua
diff --git a/aegisub/automation/include/aegisub/clipboard.lua b/automation/include/aegisub/clipboard.lua
similarity index 100%
rename from aegisub/automation/include/aegisub/clipboard.lua
rename to automation/include/aegisub/clipboard.lua
diff --git a/aegisub/automation/include/aegisub/re.moon b/automation/include/aegisub/re.moon
similarity index 100%
rename from aegisub/automation/include/aegisub/re.moon
rename to automation/include/aegisub/re.moon
diff --git a/aegisub/automation/include/aegisub/unicode.moon b/automation/include/aegisub/unicode.moon
similarity index 100%
rename from aegisub/automation/include/aegisub/unicode.moon
rename to automation/include/aegisub/unicode.moon
diff --git a/aegisub/automation/include/aegisub/util.moon b/automation/include/aegisub/util.moon
similarity index 100%
rename from aegisub/automation/include/aegisub/util.moon
rename to automation/include/aegisub/util.moon
diff --git a/aegisub/automation/include/cleantags.lua b/automation/include/cleantags.lua
similarity index 100%
rename from aegisub/automation/include/cleantags.lua
rename to automation/include/cleantags.lua
diff --git a/aegisub/automation/include/clipboard.lua b/automation/include/clipboard.lua
similarity index 100%
rename from aegisub/automation/include/clipboard.lua
rename to automation/include/clipboard.lua
diff --git a/aegisub/automation/include/karaskel-auto4.lua b/automation/include/karaskel-auto4.lua
similarity index 100%
rename from aegisub/automation/include/karaskel-auto4.lua
rename to automation/include/karaskel-auto4.lua
diff --git a/aegisub/automation/include/karaskel.lua b/automation/include/karaskel.lua
similarity index 100%
rename from aegisub/automation/include/karaskel.lua
rename to automation/include/karaskel.lua
diff --git a/aegisub/automation/include/moonscript.lua b/automation/include/moonscript.lua
similarity index 100%
rename from aegisub/automation/include/moonscript.lua
rename to automation/include/moonscript.lua
diff --git a/aegisub/automation/include/re.lua b/automation/include/re.lua
similarity index 100%
rename from aegisub/automation/include/re.lua
rename to automation/include/re.lua
diff --git a/aegisub/automation/include/unicode.lua b/automation/include/unicode.lua
similarity index 100%
rename from aegisub/automation/include/unicode.lua
rename to automation/include/unicode.lua
diff --git a/aegisub/automation/include/utils-auto4.lua b/automation/include/utils-auto4.lua
similarity index 100%
rename from aegisub/automation/include/utils-auto4.lua
rename to automation/include/utils-auto4.lua
diff --git a/aegisub/automation/include/utils.lua b/automation/include/utils.lua
similarity index 100%
rename from aegisub/automation/include/utils.lua
rename to automation/include/utils.lua
diff --git a/aegisub/automation/tests/aegisub.cpp b/automation/tests/aegisub.cpp
similarity index 100%
rename from aegisub/automation/tests/aegisub.cpp
rename to automation/tests/aegisub.cpp
diff --git a/aegisub/automation/tests/automation/appended-lines.lua b/automation/tests/automation/appended-lines.lua
similarity index 100%
rename from aegisub/automation/tests/automation/appended-lines.lua
rename to automation/tests/automation/appended-lines.lua
diff --git a/aegisub/automation/tests/automation/basic-export-test.lua b/automation/tests/automation/basic-export-test.lua
similarity index 100%
rename from aegisub/automation/tests/automation/basic-export-test.lua
rename to automation/tests/automation/basic-export-test.lua
diff --git a/aegisub/automation/tests/automation/basic-tests.lua b/automation/tests/automation/basic-tests.lua
similarity index 100%
rename from aegisub/automation/tests/automation/basic-tests.lua
rename to automation/tests/automation/basic-tests.lua
diff --git a/aegisub/automation/tests/automation/config-dialog-test.lua b/automation/tests/automation/config-dialog-test.lua
similarity index 100%
rename from aegisub/automation/tests/automation/config-dialog-test.lua
rename to automation/tests/automation/config-dialog-test.lua
diff --git a/aegisub/automation/tests/automation/furi-test.ass b/automation/tests/automation/furi-test.ass
similarity index 100%
rename from aegisub/automation/tests/automation/furi-test.ass
rename to automation/tests/automation/furi-test.ass
diff --git a/aegisub/automation/tests/automation/gen-absurd-t-line.lua b/automation/tests/automation/gen-absurd-t-line.lua
similarity index 100%
rename from aegisub/automation/tests/automation/gen-absurd-t-line.lua
rename to automation/tests/automation/gen-absurd-t-line.lua
diff --git a/aegisub/automation/tests/automation/hello-world.lua b/automation/tests/automation/hello-world.lua
similarity index 100%
rename from aegisub/automation/tests/automation/hello-world.lua
rename to automation/tests/automation/hello-world.lua
diff --git a/aegisub/automation/tests/automation/kara-templater-retime.ass b/automation/tests/automation/kara-templater-retime.ass
similarity index 100%
rename from aegisub/automation/tests/automation/kara-templater-retime.ass
rename to automation/tests/automation/kara-templater-retime.ass
diff --git a/aegisub/automation/tests/automation/karaoke-parse-test.lua b/automation/tests/automation/karaoke-parse-test.lua
similarity index 100%
rename from aegisub/automation/tests/automation/karaoke-parse-test.lua
rename to automation/tests/automation/karaoke-parse-test.lua
diff --git a/aegisub/automation/tests/automation/progress-reporting-test.lua b/automation/tests/automation/progress-reporting-test.lua
similarity index 100%
rename from aegisub/automation/tests/automation/progress-reporting-test.lua
rename to automation/tests/automation/progress-reporting-test.lua
diff --git a/aegisub/automation/tests/automation/selection-set-test.lua b/automation/tests/automation/selection-set-test.lua
similarity index 100%
rename from aegisub/automation/tests/automation/selection-set-test.lua
rename to automation/tests/automation/selection-set-test.lua
diff --git a/aegisub/automation/tests/automation/test-filter-name-clash.lua b/automation/tests/automation/test-filter-name-clash.lua
similarity index 100%
rename from aegisub/automation/tests/automation/test-filter-name-clash.lua
rename to automation/tests/automation/test-filter-name-clash.lua
diff --git a/aegisub/automation/tests/automation/test-furi.lua b/automation/tests/automation/test-furi.lua
similarity index 100%
rename from aegisub/automation/tests/automation/test-furi.lua
rename to automation/tests/automation/test-furi.lua
diff --git a/aegisub/automation/tests/automation/test-tablecopy-recursive.lua b/automation/tests/automation/test-tablecopy-recursive.lua
similarity index 100%
rename from aegisub/automation/tests/automation/test-tablecopy-recursive.lua
rename to automation/tests/automation/test-tablecopy-recursive.lua
diff --git a/aegisub/automation/tests/automation/test-text_extents.lua b/automation/tests/automation/test-text_extents.lua
similarity index 100%
rename from aegisub/automation/tests/automation/test-text_extents.lua
rename to automation/tests/automation/test-text_extents.lua
diff --git a/aegisub/automation/tests/automation/text-extents-test.lua b/automation/tests/automation/text-extents-test.lua
similarity index 100%
rename from aegisub/automation/tests/automation/text-extents-test.lua
rename to automation/tests/automation/text-extents-test.lua
diff --git a/aegisub/automation/tests/automation/trace-level-test.lua b/automation/tests/automation/trace-level-test.lua
similarity index 100%
rename from aegisub/automation/tests/automation/trace-level-test.lua
rename to automation/tests/automation/trace-level-test.lua
diff --git a/aegisub/automation/tests/automation/unicode-test.lua b/automation/tests/automation/unicode-test.lua
similarity index 100%
rename from aegisub/automation/tests/automation/unicode-test.lua
rename to automation/tests/automation/unicode-test.lua
diff --git a/aegisub/automation/tests/modules/re.moon b/automation/tests/modules/re.moon
similarity index 100%
rename from aegisub/automation/tests/modules/re.moon
rename to automation/tests/modules/re.moon
diff --git a/aegisub/automation/tests/modules/unicode.moon b/automation/tests/modules/unicode.moon
similarity index 100%
rename from aegisub/automation/tests/modules/unicode.moon
rename to automation/tests/modules/unicode.moon
diff --git a/aegisub/automation/tests/runner.moon b/automation/tests/runner.moon
similarity index 100%
rename from aegisub/automation/tests/runner.moon
rename to automation/tests/runner.moon
diff --git a/aegisub/automation/v4-docs/basic-function-interface.txt b/automation/v4-docs/basic-function-interface.txt
similarity index 100%
rename from aegisub/automation/v4-docs/basic-function-interface.txt
rename to automation/v4-docs/basic-function-interface.txt
diff --git a/aegisub/automation/v4-docs/configuration-dialogs.txt b/automation/v4-docs/configuration-dialogs.txt
similarity index 100%
rename from aegisub/automation/v4-docs/configuration-dialogs.txt
rename to automation/v4-docs/configuration-dialogs.txt
diff --git a/aegisub/automation/v4-docs/file-streams.txt b/automation/v4-docs/file-streams.txt
similarity index 100%
rename from aegisub/automation/v4-docs/file-streams.txt
rename to automation/v4-docs/file-streams.txt
diff --git a/aegisub/automation/v4-docs/misc.txt b/automation/v4-docs/misc.txt
similarity index 100%
rename from aegisub/automation/v4-docs/misc.txt
rename to automation/v4-docs/misc.txt
diff --git a/aegisub/automation/v4-docs/overview.txt b/automation/v4-docs/overview.txt
similarity index 100%
rename from aegisub/automation/v4-docs/overview.txt
rename to automation/v4-docs/overview.txt
diff --git a/aegisub/automation/v4-docs/progress-reporting.txt b/automation/v4-docs/progress-reporting.txt
similarity index 100%
rename from aegisub/automation/v4-docs/progress-reporting.txt
rename to automation/v4-docs/progress-reporting.txt
diff --git a/aegisub/automation/v4-docs/subtitle-data.txt b/automation/v4-docs/subtitle-data.txt
similarity index 100%
rename from aegisub/automation/v4-docs/subtitle-data.txt
rename to automation/v4-docs/subtitle-data.txt
diff --git a/aegisub/automation/v4-docs/template-scripting-ideas.ass b/automation/v4-docs/template-scripting-ideas.ass
similarity index 100%
rename from aegisub/automation/v4-docs/template-scripting-ideas.ass
rename to automation/v4-docs/template-scripting-ideas.ass
diff --git a/aegisub/build/Aegisub/Aegisub.targets b/build/Aegisub/Aegisub.targets
similarity index 100%
rename from aegisub/build/Aegisub/Aegisub.targets
rename to build/Aegisub/Aegisub.targets
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/build/Aegisub/Aegisub.vcxproj
similarity index 99%
rename from aegisub/build/Aegisub/Aegisub.vcxproj
rename to build/Aegisub/Aegisub.vcxproj
index e9f336876..d94932365 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/build/Aegisub/Aegisub.vcxproj
@@ -34,7 +34,7 @@
Command="$(MSBuildThisFileDirectory)..\version.sh"
WorkingDirectory="$(AegisubSourceBase)"
Configuration="@(ExecShellScript)"
- Arguments=".." />
+ Arguments="." />
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj.filters b/build/Aegisub/Aegisub.vcxproj.filters
similarity index 100%
rename from aegisub/build/Aegisub/Aegisub.vcxproj.filters
rename to build/Aegisub/Aegisub.vcxproj.filters
diff --git a/aegisub/build/Aegisub/Aegisub.xml b/build/Aegisub/Aegisub.xml
similarity index 100%
rename from aegisub/build/Aegisub/Aegisub.xml
rename to build/Aegisub/Aegisub.xml
diff --git a/aegisub/build/Aegisub/standard-libraries.props b/build/Aegisub/standard-libraries.props
similarity index 100%
rename from aegisub/build/Aegisub/standard-libraries.props
rename to build/Aegisub/standard-libraries.props
diff --git a/aegisub/build/BuildTasks/BuildTasks.csproj b/build/BuildTasks/BuildTasks.csproj
similarity index 94%
rename from aegisub/build/BuildTasks/BuildTasks.csproj
rename to build/BuildTasks/BuildTasks.csproj
index 8ea795379..ddd81bc2b 100644
--- a/aegisub/build/BuildTasks/BuildTasks.csproj
+++ b/build/BuildTasks/BuildTasks.csproj
@@ -35,7 +35,7 @@
- ..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
+ ..\..\.nuget\lib\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
@@ -70,4 +70,4 @@
-->
-
+
\ No newline at end of file
diff --git a/aegisub/build/BuildTasks/DownloadTgzFile.cs b/build/BuildTasks/DownloadTgzFile.cs
similarity index 100%
rename from aegisub/build/BuildTasks/DownloadTgzFile.cs
rename to build/BuildTasks/DownloadTgzFile.cs
diff --git a/aegisub/build/BuildTasks/ExecShellScript.cs b/build/BuildTasks/ExecShellScript.cs
similarity index 100%
rename from aegisub/build/BuildTasks/ExecShellScript.cs
rename to build/BuildTasks/ExecShellScript.cs
diff --git a/aegisub/build/BuildTasks/MsysPath.cs b/build/BuildTasks/MsysPath.cs
similarity index 100%
rename from aegisub/build/BuildTasks/MsysPath.cs
rename to build/BuildTasks/MsysPath.cs
diff --git a/aegisub/build/BuildTasks/Properties/AssemblyInfo.cs b/build/BuildTasks/Properties/AssemblyInfo.cs
similarity index 100%
rename from aegisub/build/BuildTasks/Properties/AssemblyInfo.cs
rename to build/BuildTasks/Properties/AssemblyInfo.cs
diff --git a/aegisub/build/BuildTasks/ShellWrapper.cs b/build/BuildTasks/ShellWrapper.cs
similarity index 100%
rename from aegisub/build/BuildTasks/ShellWrapper.cs
rename to build/BuildTasks/ShellWrapper.cs
diff --git a/aegisub/build/BuildTasks/UpdateFile.cs b/build/BuildTasks/UpdateFile.cs
similarity index 100%
rename from aegisub/build/BuildTasks/UpdateFile.cs
rename to build/BuildTasks/UpdateFile.cs
diff --git a/aegisub/build/BuildTasks/Utils.cs b/build/BuildTasks/Utils.cs
similarity index 100%
rename from aegisub/build/BuildTasks/Utils.cs
rename to build/BuildTasks/Utils.cs
diff --git a/aegisub/build/BuildTasks/packages.config b/build/BuildTasks/packages.config
similarity index 100%
rename from aegisub/build/BuildTasks/packages.config
rename to build/BuildTasks/packages.config
diff --git a/aegisub/build/DefaultConfiguration.props b/build/DefaultConfiguration.props
similarity index 100%
rename from aegisub/build/DefaultConfiguration.props
rename to build/DefaultConfiguration.props
diff --git a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj b/build/PortableInstaller/PortableInstaller.vcxproj
similarity index 100%
rename from aegisub/build/PortableInstaller/PortableInstaller.vcxproj
rename to build/PortableInstaller/PortableInstaller.vcxproj
diff --git a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters b/build/PortableInstaller/PortableInstaller.vcxproj.filters
similarity index 100%
rename from aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters
rename to build/PortableInstaller/PortableInstaller.vcxproj.filters
diff --git a/aegisub/build/aegisub.props b/build/aegisub.props
similarity index 100%
rename from aegisub/build/aegisub.props
rename to build/aegisub.props
diff --git a/aegisub/build/boost/boost.vcxproj b/build/boost/boost.vcxproj
similarity index 100%
rename from aegisub/build/boost/boost.vcxproj
rename to build/boost/boost.vcxproj
diff --git a/aegisub/build/boost/boost.vcxproj.filters b/build/boost/boost.vcxproj.filters
similarity index 100%
rename from aegisub/build/boost/boost.vcxproj.filters
rename to build/boost/boost.vcxproj.filters
diff --git a/aegisub/build/csrihelper/csrihelper.vcxproj b/build/csrihelper/csrihelper.vcxproj
similarity index 100%
rename from aegisub/build/csrihelper/csrihelper.vcxproj
rename to build/csrihelper/csrihelper.vcxproj
diff --git a/aegisub/build/csrihelper/csrihelper.vcxproj.filters b/build/csrihelper/csrihelper.vcxproj.filters
similarity index 100%
rename from aegisub/build/csrihelper/csrihelper.vcxproj.filters
rename to build/csrihelper/csrihelper.vcxproj.filters
diff --git a/aegisub/build/ffmpeg/ffmpeg.vcxproj b/build/ffmpeg/ffmpeg.vcxproj
similarity index 100%
rename from aegisub/build/ffmpeg/ffmpeg.vcxproj
rename to build/ffmpeg/ffmpeg.vcxproj
diff --git a/aegisub/build/ffmpeg/ffmpeg.vcxproj.filters b/build/ffmpeg/ffmpeg.vcxproj.filters
similarity index 100%
rename from aegisub/build/ffmpeg/ffmpeg.vcxproj.filters
rename to build/ffmpeg/ffmpeg.vcxproj.filters
diff --git a/aegisub/build/ffms2/ffms2.vcxproj b/build/ffms2/ffms2.vcxproj
similarity index 100%
rename from aegisub/build/ffms2/ffms2.vcxproj
rename to build/ffms2/ffms2.vcxproj
diff --git a/aegisub/build/fftw/config.h b/build/fftw/config.h
similarity index 100%
rename from aegisub/build/fftw/config.h
rename to build/fftw/config.h
diff --git a/aegisub/build/fftw/fftw.vcxproj b/build/fftw/fftw.vcxproj
similarity index 100%
rename from aegisub/build/fftw/fftw.vcxproj
rename to build/fftw/fftw.vcxproj
diff --git a/aegisub/build/fftw/fftw.vcxproj.filters b/build/fftw/fftw.vcxproj.filters
similarity index 100%
rename from aegisub/build/fftw/fftw.vcxproj.filters
rename to build/fftw/fftw.vcxproj.filters
diff --git a/aegisub/build/fontconfig/fontconfig.vcxproj b/build/fontconfig/fontconfig.vcxproj
similarity index 100%
rename from aegisub/build/fontconfig/fontconfig.vcxproj
rename to build/fontconfig/fontconfig.vcxproj
diff --git a/aegisub/build/fontconfig/fontconfig.vcxproj.filters b/build/fontconfig/fontconfig.vcxproj.filters
similarity index 100%
rename from aegisub/build/fontconfig/fontconfig.vcxproj.filters
rename to build/fontconfig/fontconfig.vcxproj.filters
diff --git a/aegisub/build/freetype2/freetype.vcxproj b/build/freetype2/freetype.vcxproj
similarity index 100%
rename from aegisub/build/freetype2/freetype.vcxproj
rename to build/freetype2/freetype.vcxproj
diff --git a/aegisub/build/freetype2/freetype.vcxproj.filters b/build/freetype2/freetype.vcxproj.filters
similarity index 100%
rename from aegisub/build/freetype2/freetype.vcxproj.filters
rename to build/freetype2/freetype.vcxproj.filters
diff --git a/aegisub/build/fribidi/fribidi.vcxproj b/build/fribidi/fribidi.vcxproj
similarity index 100%
rename from aegisub/build/fribidi/fribidi.vcxproj
rename to build/fribidi/fribidi.vcxproj
diff --git a/aegisub/build/fribidi/fribidi.vcxproj.filters b/build/fribidi/fribidi.vcxproj.filters
similarity index 100%
rename from aegisub/build/fribidi/fribidi.vcxproj.filters
rename to build/fribidi/fribidi.vcxproj.filters
diff --git a/aegisub/build/googletest/googletest.vcxproj b/build/googletest/googletest.vcxproj
similarity index 100%
rename from aegisub/build/googletest/googletest.vcxproj
rename to build/googletest/googletest.vcxproj
diff --git a/aegisub/build/googletest/googletest.vcxproj.filters b/build/googletest/googletest.vcxproj.filters
similarity index 100%
rename from aegisub/build/googletest/googletest.vcxproj.filters
rename to build/googletest/googletest.vcxproj.filters
diff --git a/aegisub/build/hunspell/hunspell.vcxproj b/build/hunspell/hunspell.vcxproj
similarity index 100%
rename from aegisub/build/hunspell/hunspell.vcxproj
rename to build/hunspell/hunspell.vcxproj
diff --git a/aegisub/build/hunspell/hunspell.vcxproj.filters b/build/hunspell/hunspell.vcxproj.filters
similarity index 100%
rename from aegisub/build/hunspell/hunspell.vcxproj.filters
rename to build/hunspell/hunspell.vcxproj.filters
diff --git a/aegisub/build/icu/icu.vcxproj b/build/icu/icu.vcxproj
similarity index 100%
rename from aegisub/build/icu/icu.vcxproj
rename to build/icu/icu.vcxproj
diff --git a/aegisub/build/icu/mh-msys-msvc b/build/icu/mh-msys-msvc
similarity index 100%
rename from aegisub/build/icu/mh-msys-msvc
rename to build/icu/mh-msys-msvc
diff --git a/aegisub/build/install.targets b/build/install.targets
similarity index 100%
rename from aegisub/build/install.targets
rename to build/install.targets
diff --git a/aegisub/build/libaegisub/libaegisub.vcxproj b/build/libaegisub/libaegisub.vcxproj
similarity index 100%
rename from aegisub/build/libaegisub/libaegisub.vcxproj
rename to build/libaegisub/libaegisub.vcxproj
diff --git a/aegisub/build/libaegisub/libaegisub.vcxproj.filters b/build/libaegisub/libaegisub.vcxproj.filters
similarity index 100%
rename from aegisub/build/libaegisub/libaegisub.vcxproj.filters
rename to build/libaegisub/libaegisub.vcxproj.filters
diff --git a/aegisub/build/libass/config.h b/build/libass/config.h
similarity index 100%
rename from aegisub/build/libass/config.h
rename to build/libass/config.h
diff --git a/aegisub/build/libass/libass.vcxproj b/build/libass/libass.vcxproj
similarity index 100%
rename from aegisub/build/libass/libass.vcxproj
rename to build/libass/libass.vcxproj
diff --git a/aegisub/build/libass/libass.vcxproj.filters b/build/libass/libass.vcxproj.filters
similarity index 100%
rename from aegisub/build/libass/libass.vcxproj.filters
rename to build/libass/libass.vcxproj.filters
diff --git a/aegisub/build/libass/strings.h b/build/libass/strings.h
similarity index 100%
rename from aegisub/build/libass/strings.h
rename to build/libass/strings.h
diff --git a/aegisub/build/libass/unistd.h b/build/libass/unistd.h
similarity index 100%
rename from aegisub/build/libass/unistd.h
rename to build/libass/unistd.h
diff --git a/aegisub/build/libiconv/libiconv.vcxproj b/build/libiconv/libiconv.vcxproj
similarity index 100%
rename from aegisub/build/libiconv/libiconv.vcxproj
rename to build/libiconv/libiconv.vcxproj
diff --git a/aegisub/build/libiconv/libiconv.vcxproj.filters b/build/libiconv/libiconv.vcxproj.filters
similarity index 100%
rename from aegisub/build/libiconv/libiconv.vcxproj.filters
rename to build/libiconv/libiconv.vcxproj.filters
diff --git a/aegisub/build/libresrc/libresrc.vcxproj b/build/libresrc/libresrc.vcxproj
similarity index 100%
rename from aegisub/build/libresrc/libresrc.vcxproj
rename to build/libresrc/libresrc.vcxproj
diff --git a/aegisub/build/libresrc/libresrc.vcxproj.filters b/build/libresrc/libresrc.vcxproj.filters
similarity index 100%
rename from aegisub/build/libresrc/libresrc.vcxproj.filters
rename to build/libresrc/libresrc.vcxproj.filters
diff --git a/aegisub/build/lua51/lua51.vcxproj b/build/lua51/lua51.vcxproj
similarity index 100%
rename from aegisub/build/lua51/lua51.vcxproj
rename to build/lua51/lua51.vcxproj
diff --git a/aegisub/build/lua51/lua51.vcxproj.filters b/build/lua51/lua51.vcxproj.filters
similarity index 100%
rename from aegisub/build/lua51/lua51.vcxproj.filters
rename to build/lua51/lua51.vcxproj.filters
diff --git a/aegisub/build/paths.props b/build/paths.props
similarity index 100%
rename from aegisub/build/paths.props
rename to build/paths.props
diff --git a/aegisub/build/respack/Aegisub.ResPack.ProjectItems.xml b/build/respack/Aegisub.ResPack.ProjectItems.xml
similarity index 100%
rename from aegisub/build/respack/Aegisub.ResPack.ProjectItems.xml
rename to build/respack/Aegisub.ResPack.ProjectItems.xml
diff --git a/aegisub/build/respack/Aegisub.ResPack.targets b/build/respack/Aegisub.ResPack.targets
similarity index 100%
rename from aegisub/build/respack/Aegisub.ResPack.targets
rename to build/respack/Aegisub.ResPack.targets
diff --git a/aegisub/build/respack/Aegisub.ResPack.xml b/build/respack/Aegisub.ResPack.xml
similarity index 100%
rename from aegisub/build/respack/Aegisub.ResPack.xml
rename to build/respack/Aegisub.ResPack.xml
diff --git a/aegisub/build/respack/respack.vcxproj b/build/respack/respack.vcxproj
similarity index 100%
rename from aegisub/build/respack/respack.vcxproj
rename to build/respack/respack.vcxproj
diff --git a/aegisub/build/respack/respack.vcxproj.filters b/build/respack/respack.vcxproj.filters
similarity index 100%
rename from aegisub/build/respack/respack.vcxproj.filters
rename to build/respack/respack.vcxproj.filters
diff --git a/aegisub/build/standard-outdirs.props b/build/standard-outdirs.props
similarity index 100%
rename from aegisub/build/standard-outdirs.props
rename to build/standard-outdirs.props
diff --git a/aegisub/build/standard-settings.props b/build/standard-settings.props
similarity index 100%
rename from aegisub/build/standard-settings.props
rename to build/standard-settings.props
diff --git a/aegisub/build/tasks.props b/build/tasks.props
similarity index 100%
rename from aegisub/build/tasks.props
rename to build/tasks.props
diff --git a/aegisub/build/tests/tests.vcxproj b/build/tests/tests.vcxproj
similarity index 100%
rename from aegisub/build/tests/tests.vcxproj
rename to build/tests/tests.vcxproj
diff --git a/aegisub/build/tests/tests.vcxproj.filters b/build/tests/tests.vcxproj.filters
similarity index 100%
rename from aegisub/build/tests/tests.vcxproj.filters
rename to build/tests/tests.vcxproj.filters
diff --git a/aegisub/build/universalchardet/universalchardet.vcxproj b/build/universalchardet/universalchardet.vcxproj
similarity index 100%
rename from aegisub/build/universalchardet/universalchardet.vcxproj
rename to build/universalchardet/universalchardet.vcxproj
diff --git a/aegisub/build/universalchardet/universalchardet.vcxproj.filters b/build/universalchardet/universalchardet.vcxproj.filters
similarity index 100%
rename from aegisub/build/universalchardet/universalchardet.vcxproj.filters
rename to build/universalchardet/universalchardet.vcxproj.filters
diff --git a/aegisub/build/userconfig/ft2.props.sample b/build/userconfig/ft2.props.sample
similarity index 100%
rename from aegisub/build/userconfig/ft2.props.sample
rename to build/userconfig/ft2.props.sample
diff --git a/aegisub/build/userconfig/paths.props.sample b/build/userconfig/paths.props.sample
similarity index 100%
rename from aegisub/build/userconfig/paths.props.sample
rename to build/userconfig/paths.props.sample
diff --git a/aegisub/build/userconfig/readme.txt b/build/userconfig/readme.txt
similarity index 100%
rename from aegisub/build/userconfig/readme.txt
rename to build/userconfig/readme.txt
diff --git a/aegisub/build/userconfig/wx.props.sample b/build/userconfig/wx.props.sample
similarity index 100%
rename from aegisub/build/userconfig/wx.props.sample
rename to build/userconfig/wx.props.sample
diff --git a/aegisub/build/version.sh b/build/version.sh
similarity index 97%
rename from aegisub/build/version.sh
rename to build/version.sh
index 022124404..82c087917 100755
--- a/aegisub/build/version.sh
+++ b/build/version.sh
@@ -2,7 +2,7 @@ srcdir="$1"
# If no git repo try to read from the existing git_version.h, for building from tarballs
if ! test -d "${srcdir}/.git"; then
- version_h_path="${srcdir}/aegisub/build/git_version.h"
+ version_h_path="${srcdir}/build/git_version.h"
if test -f "${version_h_path}"; then
while read line; do
set -- $line
diff --git a/aegisub/build/wx/setup-build.h b/build/wx/setup-build.h
similarity index 100%
rename from aegisub/build/wx/setup-build.h
rename to build/wx/setup-build.h
diff --git a/aegisub/build/wx/setup-installed.h b/build/wx/setup-installed.h
similarity index 100%
rename from aegisub/build/wx/setup-installed.h
rename to build/wx/setup-installed.h
diff --git a/aegisub/build/wx/wxWidgets.vcxproj b/build/wx/wxWidgets.vcxproj
similarity index 100%
rename from aegisub/build/wx/wxWidgets.vcxproj
rename to build/wx/wxWidgets.vcxproj
diff --git a/aegisub/build/zlib/zconf.h b/build/zlib/zconf.h
similarity index 100%
rename from aegisub/build/zlib/zconf.h
rename to build/zlib/zconf.h
diff --git a/aegisub/build/zlib/zlib.vcxproj b/build/zlib/zlib.vcxproj
similarity index 100%
rename from aegisub/build/zlib/zlib.vcxproj
rename to build/zlib/zlib.vcxproj
diff --git a/aegisub/config.guess b/config.guess
similarity index 100%
rename from aegisub/config.guess
rename to config.guess
diff --git a/aegisub/config.sub b/config.sub
similarity index 100%
rename from aegisub/config.sub
rename to config.sub
diff --git a/aegisub/configure.ac b/configure.ac
similarity index 99%
rename from aegisub/configure.ac
rename to configure.ac
index b5cce0e56..be52fd678 100644
--- a/aegisub/configure.ac
+++ b/configure.ac
@@ -125,7 +125,7 @@ PKG_PROG_PKG_CONFIG([pkgconfig_required_version])
# Developers only
#################
AC_MSG_CHECKING([for version])
-. $srcdir/build/version.sh "$srcdir/.."
+. $srcdir/build/version.sh "$srcdir"
AC_MSG_RESULT([$BUILD_GIT_VERSION_STRING $VERSION_SOURCE])
AC_MSG_CHECKING([for build date])
diff --git a/aegisub/desktop/16x16/apps/aegisub.png b/desktop/16x16/apps/aegisub.png
similarity index 100%
rename from aegisub/desktop/16x16/apps/aegisub.png
rename to desktop/16x16/apps/aegisub.png
diff --git a/aegisub/desktop/22x22/apps/aegisub.png b/desktop/22x22/apps/aegisub.png
similarity index 100%
rename from aegisub/desktop/22x22/apps/aegisub.png
rename to desktop/22x22/apps/aegisub.png
diff --git a/aegisub/desktop/24x24/apps/aegisub.png b/desktop/24x24/apps/aegisub.png
similarity index 100%
rename from aegisub/desktop/24x24/apps/aegisub.png
rename to desktop/24x24/apps/aegisub.png
diff --git a/aegisub/desktop/32x32/apps/aegisub.png b/desktop/32x32/apps/aegisub.png
similarity index 100%
rename from aegisub/desktop/32x32/apps/aegisub.png
rename to desktop/32x32/apps/aegisub.png
diff --git a/aegisub/desktop/48x48/apps/aegisub.png b/desktop/48x48/apps/aegisub.png
similarity index 100%
rename from aegisub/desktop/48x48/apps/aegisub.png
rename to desktop/48x48/apps/aegisub.png
diff --git a/aegisub/desktop/64x64/apps/aegisub.png b/desktop/64x64/apps/aegisub.png
similarity index 100%
rename from aegisub/desktop/64x64/apps/aegisub.png
rename to desktop/64x64/apps/aegisub.png
diff --git a/aegisub/desktop/Makefile b/desktop/Makefile
similarity index 100%
rename from aegisub/desktop/Makefile
rename to desktop/Makefile
diff --git a/aegisub/desktop/aegisub.desktop.template.in b/desktop/aegisub.desktop.template.in
similarity index 100%
rename from aegisub/desktop/aegisub.desktop.template.in
rename to desktop/aegisub.desktop.template.in
diff --git a/aegisub/desktop/scalable/apps/aegisub.svg b/desktop/scalable/apps/aegisub.svg
similarity index 100%
rename from aegisub/desktop/scalable/apps/aegisub.svg
rename to desktop/scalable/apps/aegisub.svg
diff --git a/aegisub/install-sh b/install-sh
similarity index 100%
rename from aegisub/install-sh
rename to install-sh
diff --git a/aegisub/libaegisub/Makefile b/libaegisub/Makefile
similarity index 100%
rename from aegisub/libaegisub/Makefile
rename to libaegisub/Makefile
diff --git a/aegisub/libaegisub/ass/dialogue_parser.cpp b/libaegisub/ass/dialogue_parser.cpp
similarity index 100%
rename from aegisub/libaegisub/ass/dialogue_parser.cpp
rename to libaegisub/ass/dialogue_parser.cpp
diff --git a/aegisub/libaegisub/ass/uuencode.cpp b/libaegisub/ass/uuencode.cpp
similarity index 100%
rename from aegisub/libaegisub/ass/uuencode.cpp
rename to libaegisub/ass/uuencode.cpp
diff --git a/aegisub/libaegisub/common/cajun/elements.cpp b/libaegisub/common/cajun/elements.cpp
similarity index 100%
rename from aegisub/libaegisub/common/cajun/elements.cpp
rename to libaegisub/common/cajun/elements.cpp
diff --git a/aegisub/libaegisub/common/cajun/reader.cpp b/libaegisub/common/cajun/reader.cpp
similarity index 100%
rename from aegisub/libaegisub/common/cajun/reader.cpp
rename to libaegisub/common/cajun/reader.cpp
diff --git a/aegisub/libaegisub/common/cajun/writer.cpp b/libaegisub/common/cajun/writer.cpp
similarity index 100%
rename from aegisub/libaegisub/common/cajun/writer.cpp
rename to libaegisub/common/cajun/writer.cpp
diff --git a/aegisub/libaegisub/common/calltip_provider.cpp b/libaegisub/common/calltip_provider.cpp
similarity index 100%
rename from aegisub/libaegisub/common/calltip_provider.cpp
rename to libaegisub/common/calltip_provider.cpp
diff --git a/aegisub/libaegisub/common/charset.cpp b/libaegisub/common/charset.cpp
similarity index 100%
rename from aegisub/libaegisub/common/charset.cpp
rename to libaegisub/common/charset.cpp
diff --git a/aegisub/libaegisub/common/charset_6937.cpp b/libaegisub/common/charset_6937.cpp
similarity index 100%
rename from aegisub/libaegisub/common/charset_6937.cpp
rename to libaegisub/common/charset_6937.cpp
diff --git a/aegisub/libaegisub/common/charset_6937.h b/libaegisub/common/charset_6937.h
similarity index 100%
rename from aegisub/libaegisub/common/charset_6937.h
rename to libaegisub/common/charset_6937.h
diff --git a/aegisub/libaegisub/common/charset_conv.cpp b/libaegisub/common/charset_conv.cpp
similarity index 100%
rename from aegisub/libaegisub/common/charset_conv.cpp
rename to libaegisub/common/charset_conv.cpp
diff --git a/aegisub/libaegisub/common/color.cpp b/libaegisub/common/color.cpp
similarity index 100%
rename from aegisub/libaegisub/common/color.cpp
rename to libaegisub/common/color.cpp
diff --git a/aegisub/libaegisub/common/dispatch.cpp b/libaegisub/common/dispatch.cpp
similarity index 100%
rename from aegisub/libaegisub/common/dispatch.cpp
rename to libaegisub/common/dispatch.cpp
diff --git a/aegisub/libaegisub/common/fs.cpp b/libaegisub/common/fs.cpp
similarity index 100%
rename from aegisub/libaegisub/common/fs.cpp
rename to libaegisub/common/fs.cpp
diff --git a/aegisub/libaegisub/common/hotkey.cpp b/libaegisub/common/hotkey.cpp
similarity index 100%
rename from aegisub/libaegisub/common/hotkey.cpp
rename to libaegisub/common/hotkey.cpp
diff --git a/aegisub/libaegisub/common/io.cpp b/libaegisub/common/io.cpp
similarity index 100%
rename from aegisub/libaegisub/common/io.cpp
rename to libaegisub/common/io.cpp
diff --git a/aegisub/libaegisub/common/json.cpp b/libaegisub/common/json.cpp
similarity index 100%
rename from aegisub/libaegisub/common/json.cpp
rename to libaegisub/common/json.cpp
diff --git a/aegisub/libaegisub/common/kana_table.cpp b/libaegisub/common/kana_table.cpp
similarity index 100%
rename from aegisub/libaegisub/common/kana_table.cpp
rename to libaegisub/common/kana_table.cpp
diff --git a/aegisub/libaegisub/common/karaoke_matcher.cpp b/libaegisub/common/karaoke_matcher.cpp
similarity index 100%
rename from aegisub/libaegisub/common/karaoke_matcher.cpp
rename to libaegisub/common/karaoke_matcher.cpp
diff --git a/aegisub/libaegisub/common/keyframe.cpp b/libaegisub/common/keyframe.cpp
similarity index 100%
rename from aegisub/libaegisub/common/keyframe.cpp
rename to libaegisub/common/keyframe.cpp
diff --git a/aegisub/libaegisub/common/log.cpp b/libaegisub/common/log.cpp
similarity index 100%
rename from aegisub/libaegisub/common/log.cpp
rename to libaegisub/common/log.cpp
diff --git a/aegisub/libaegisub/common/mru.cpp b/libaegisub/common/mru.cpp
similarity index 100%
rename from aegisub/libaegisub/common/mru.cpp
rename to libaegisub/common/mru.cpp
diff --git a/aegisub/libaegisub/common/option.cpp b/libaegisub/common/option.cpp
similarity index 100%
rename from aegisub/libaegisub/common/option.cpp
rename to libaegisub/common/option.cpp
diff --git a/aegisub/libaegisub/common/option_visit.cpp b/libaegisub/common/option_visit.cpp
similarity index 100%
rename from aegisub/libaegisub/common/option_visit.cpp
rename to libaegisub/common/option_visit.cpp
diff --git a/aegisub/libaegisub/common/option_visit.h b/libaegisub/common/option_visit.h
similarity index 100%
rename from aegisub/libaegisub/common/option_visit.h
rename to libaegisub/common/option_visit.h
diff --git a/aegisub/libaegisub/common/parser.cpp b/libaegisub/common/parser.cpp
similarity index 100%
rename from aegisub/libaegisub/common/parser.cpp
rename to libaegisub/common/parser.cpp
diff --git a/aegisub/libaegisub/common/parser.h b/libaegisub/common/parser.h
similarity index 100%
rename from aegisub/libaegisub/common/parser.h
rename to libaegisub/common/parser.h
diff --git a/aegisub/libaegisub/common/path.cpp b/libaegisub/common/path.cpp
similarity index 100%
rename from aegisub/libaegisub/common/path.cpp
rename to libaegisub/common/path.cpp
diff --git a/aegisub/libaegisub/common/thesaurus.cpp b/libaegisub/common/thesaurus.cpp
similarity index 100%
rename from aegisub/libaegisub/common/thesaurus.cpp
rename to libaegisub/common/thesaurus.cpp
diff --git a/aegisub/libaegisub/common/util.cpp b/libaegisub/common/util.cpp
similarity index 100%
rename from aegisub/libaegisub/common/util.cpp
rename to libaegisub/common/util.cpp
diff --git a/aegisub/libaegisub/common/vfr.cpp b/libaegisub/common/vfr.cpp
similarity index 100%
rename from aegisub/libaegisub/common/vfr.cpp
rename to libaegisub/common/vfr.cpp
diff --git a/aegisub/libaegisub/config.h b/libaegisub/config.h
similarity index 100%
rename from aegisub/libaegisub/config.h
rename to libaegisub/config.h
diff --git a/aegisub/libaegisub/include/libaegisub/access.h b/libaegisub/include/libaegisub/access.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/access.h
rename to libaegisub/include/libaegisub/access.h
diff --git a/aegisub/libaegisub/include/libaegisub/address_of_adaptor.h b/libaegisub/include/libaegisub/address_of_adaptor.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/address_of_adaptor.h
rename to libaegisub/include/libaegisub/address_of_adaptor.h
diff --git a/aegisub/libaegisub/include/libaegisub/ass/dialogue_parser.h b/libaegisub/include/libaegisub/ass/dialogue_parser.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/ass/dialogue_parser.h
rename to libaegisub/include/libaegisub/ass/dialogue_parser.h
diff --git a/aegisub/libaegisub/include/libaegisub/ass/uuencode.h b/libaegisub/include/libaegisub/ass/uuencode.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/ass/uuencode.h
rename to libaegisub/include/libaegisub/ass/uuencode.h
diff --git a/aegisub/libaegisub/include/libaegisub/background_runner.h b/libaegisub/include/libaegisub/background_runner.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/background_runner.h
rename to libaegisub/include/libaegisub/background_runner.h
diff --git a/aegisub/libaegisub/include/libaegisub/cajun/elements.h b/libaegisub/include/libaegisub/cajun/elements.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/cajun/elements.h
rename to libaegisub/include/libaegisub/cajun/elements.h
diff --git a/aegisub/libaegisub/include/libaegisub/cajun/reader.h b/libaegisub/include/libaegisub/cajun/reader.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/cajun/reader.h
rename to libaegisub/include/libaegisub/cajun/reader.h
diff --git a/aegisub/libaegisub/include/libaegisub/cajun/visitor.h b/libaegisub/include/libaegisub/cajun/visitor.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/cajun/visitor.h
rename to libaegisub/include/libaegisub/cajun/visitor.h
diff --git a/aegisub/libaegisub/include/libaegisub/cajun/writer.h b/libaegisub/include/libaegisub/cajun/writer.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/cajun/writer.h
rename to libaegisub/include/libaegisub/cajun/writer.h
diff --git a/aegisub/libaegisub/include/libaegisub/calltip_provider.h b/libaegisub/include/libaegisub/calltip_provider.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/calltip_provider.h
rename to libaegisub/include/libaegisub/calltip_provider.h
diff --git a/aegisub/libaegisub/include/libaegisub/charset.h b/libaegisub/include/libaegisub/charset.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/charset.h
rename to libaegisub/include/libaegisub/charset.h
diff --git a/aegisub/libaegisub/include/libaegisub/charset_conv.h b/libaegisub/include/libaegisub/charset_conv.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/charset_conv.h
rename to libaegisub/include/libaegisub/charset_conv.h
diff --git a/aegisub/libaegisub/include/libaegisub/charset_conv_win.h b/libaegisub/include/libaegisub/charset_conv_win.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/charset_conv_win.h
rename to libaegisub/include/libaegisub/charset_conv_win.h
diff --git a/aegisub/libaegisub/include/libaegisub/charsets.def b/libaegisub/include/libaegisub/charsets.def
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/charsets.def
rename to libaegisub/include/libaegisub/charsets.def
diff --git a/aegisub/libaegisub/include/libaegisub/color.h b/libaegisub/include/libaegisub/color.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/color.h
rename to libaegisub/include/libaegisub/color.h
diff --git a/aegisub/libaegisub/include/libaegisub/dispatch.h b/libaegisub/include/libaegisub/dispatch.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/dispatch.h
rename to libaegisub/include/libaegisub/dispatch.h
diff --git a/aegisub/libaegisub/include/libaegisub/exception.h b/libaegisub/include/libaegisub/exception.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/exception.h
rename to libaegisub/include/libaegisub/exception.h
diff --git a/aegisub/libaegisub/include/libaegisub/fs.h b/libaegisub/include/libaegisub/fs.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/fs.h
rename to libaegisub/include/libaegisub/fs.h
diff --git a/aegisub/libaegisub/include/libaegisub/fs_fwd.h b/libaegisub/include/libaegisub/fs_fwd.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/fs_fwd.h
rename to libaegisub/include/libaegisub/fs_fwd.h
diff --git a/aegisub/libaegisub/include/libaegisub/hotkey.h b/libaegisub/include/libaegisub/hotkey.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/hotkey.h
rename to libaegisub/include/libaegisub/hotkey.h
diff --git a/aegisub/libaegisub/include/libaegisub/io.h b/libaegisub/include/libaegisub/io.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/io.h
rename to libaegisub/include/libaegisub/io.h
diff --git a/aegisub/libaegisub/include/libaegisub/json.h b/libaegisub/include/libaegisub/json.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/json.h
rename to libaegisub/include/libaegisub/json.h
diff --git a/aegisub/libaegisub/include/libaegisub/kana_table.h b/libaegisub/include/libaegisub/kana_table.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/kana_table.h
rename to libaegisub/include/libaegisub/kana_table.h
diff --git a/aegisub/libaegisub/include/libaegisub/karaoke_matcher.h b/libaegisub/include/libaegisub/karaoke_matcher.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/karaoke_matcher.h
rename to libaegisub/include/libaegisub/karaoke_matcher.h
diff --git a/aegisub/libaegisub/include/libaegisub/keyframe.h b/libaegisub/include/libaegisub/keyframe.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/keyframe.h
rename to libaegisub/include/libaegisub/keyframe.h
diff --git a/aegisub/libaegisub/include/libaegisub/line_iterator.h b/libaegisub/include/libaegisub/line_iterator.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/line_iterator.h
rename to libaegisub/include/libaegisub/line_iterator.h
diff --git a/aegisub/libaegisub/include/libaegisub/line_wrap.h b/libaegisub/include/libaegisub/line_wrap.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/line_wrap.h
rename to libaegisub/include/libaegisub/line_wrap.h
diff --git a/aegisub/libaegisub/include/libaegisub/log.h b/libaegisub/include/libaegisub/log.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/log.h
rename to libaegisub/include/libaegisub/log.h
diff --git a/aegisub/libaegisub/include/libaegisub/mru.h b/libaegisub/include/libaegisub/mru.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/mru.h
rename to libaegisub/include/libaegisub/mru.h
diff --git a/aegisub/libaegisub/include/libaegisub/of_type_adaptor.h b/libaegisub/include/libaegisub/of_type_adaptor.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/of_type_adaptor.h
rename to libaegisub/include/libaegisub/of_type_adaptor.h
diff --git a/aegisub/libaegisub/include/libaegisub/option.h b/libaegisub/include/libaegisub/option.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/option.h
rename to libaegisub/include/libaegisub/option.h
diff --git a/aegisub/libaegisub/include/libaegisub/option_value.h b/libaegisub/include/libaegisub/option_value.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/option_value.h
rename to libaegisub/include/libaegisub/option_value.h
diff --git a/aegisub/libaegisub/include/libaegisub/owning_intrusive_list.h b/libaegisub/include/libaegisub/owning_intrusive_list.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/owning_intrusive_list.h
rename to libaegisub/include/libaegisub/owning_intrusive_list.h
diff --git a/aegisub/libaegisub/include/libaegisub/path.h b/libaegisub/include/libaegisub/path.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/path.h
rename to libaegisub/include/libaegisub/path.h
diff --git a/aegisub/libaegisub/include/libaegisub/scoped_ptr.h b/libaegisub/include/libaegisub/scoped_ptr.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/scoped_ptr.h
rename to libaegisub/include/libaegisub/scoped_ptr.h
diff --git a/aegisub/libaegisub/include/libaegisub/signal.h b/libaegisub/include/libaegisub/signal.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/signal.h
rename to libaegisub/include/libaegisub/signal.h
diff --git a/aegisub/libaegisub/include/libaegisub/spellchecker.h b/libaegisub/include/libaegisub/spellchecker.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/spellchecker.h
rename to libaegisub/include/libaegisub/spellchecker.h
diff --git a/aegisub/libaegisub/include/libaegisub/split.h b/libaegisub/include/libaegisub/split.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/split.h
rename to libaegisub/include/libaegisub/split.h
diff --git a/aegisub/libaegisub/include/libaegisub/thesaurus.h b/libaegisub/include/libaegisub/thesaurus.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/thesaurus.h
rename to libaegisub/include/libaegisub/thesaurus.h
diff --git a/aegisub/libaegisub/include/libaegisub/time.h b/libaegisub/include/libaegisub/time.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/time.h
rename to libaegisub/include/libaegisub/time.h
diff --git a/aegisub/libaegisub/include/libaegisub/util.h b/libaegisub/include/libaegisub/util.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/util.h
rename to libaegisub/include/libaegisub/util.h
diff --git a/aegisub/libaegisub/include/libaegisub/util_osx.h b/libaegisub/include/libaegisub/util_osx.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/util_osx.h
rename to libaegisub/include/libaegisub/util_osx.h
diff --git a/aegisub/libaegisub/include/libaegisub/util_win.h b/libaegisub/include/libaegisub/util_win.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/util_win.h
rename to libaegisub/include/libaegisub/util_win.h
diff --git a/aegisub/libaegisub/include/libaegisub/vfr.h b/libaegisub/include/libaegisub/vfr.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/vfr.h
rename to libaegisub/include/libaegisub/vfr.h
diff --git a/aegisub/libaegisub/lagi_pre.h b/libaegisub/lagi_pre.h
similarity index 100%
rename from aegisub/libaegisub/lagi_pre.h
rename to libaegisub/lagi_pre.h
diff --git a/aegisub/libaegisub/osx/util.mm b/libaegisub/osx/util.mm
similarity index 100%
rename from aegisub/libaegisub/osx/util.mm
rename to libaegisub/osx/util.mm
diff --git a/aegisub/libaegisub/unix/access.cpp b/libaegisub/unix/access.cpp
similarity index 100%
rename from aegisub/libaegisub/unix/access.cpp
rename to libaegisub/unix/access.cpp
diff --git a/aegisub/libaegisub/unix/fs.cpp b/libaegisub/unix/fs.cpp
similarity index 100%
rename from aegisub/libaegisub/unix/fs.cpp
rename to libaegisub/unix/fs.cpp
diff --git a/aegisub/libaegisub/unix/log.cpp b/libaegisub/unix/log.cpp
similarity index 100%
rename from aegisub/libaegisub/unix/log.cpp
rename to libaegisub/unix/log.cpp
diff --git a/aegisub/libaegisub/unix/path.cpp b/libaegisub/unix/path.cpp
similarity index 100%
rename from aegisub/libaegisub/unix/path.cpp
rename to libaegisub/unix/path.cpp
diff --git a/aegisub/libaegisub/unix/util.cpp b/libaegisub/unix/util.cpp
similarity index 100%
rename from aegisub/libaegisub/unix/util.cpp
rename to libaegisub/unix/util.cpp
diff --git a/aegisub/libaegisub/windows/access.cpp b/libaegisub/windows/access.cpp
similarity index 100%
rename from aegisub/libaegisub/windows/access.cpp
rename to libaegisub/windows/access.cpp
diff --git a/aegisub/libaegisub/windows/charset_conv_win.cpp b/libaegisub/windows/charset_conv_win.cpp
similarity index 100%
rename from aegisub/libaegisub/windows/charset_conv_win.cpp
rename to libaegisub/windows/charset_conv_win.cpp
diff --git a/aegisub/libaegisub/windows/fs.cpp b/libaegisub/windows/fs.cpp
similarity index 100%
rename from aegisub/libaegisub/windows/fs.cpp
rename to libaegisub/windows/fs.cpp
diff --git a/aegisub/libaegisub/windows/lagi_pre.cpp b/libaegisub/windows/lagi_pre.cpp
similarity index 100%
rename from aegisub/libaegisub/windows/lagi_pre.cpp
rename to libaegisub/windows/lagi_pre.cpp
diff --git a/aegisub/libaegisub/windows/log_win.cpp b/libaegisub/windows/log_win.cpp
similarity index 100%
rename from aegisub/libaegisub/windows/log_win.cpp
rename to libaegisub/windows/log_win.cpp
diff --git a/aegisub/libaegisub/windows/path_win.cpp b/libaegisub/windows/path_win.cpp
similarity index 100%
rename from aegisub/libaegisub/windows/path_win.cpp
rename to libaegisub/windows/path_win.cpp
diff --git a/aegisub/libaegisub/windows/util_win.cpp b/libaegisub/windows/util_win.cpp
similarity index 100%
rename from aegisub/libaegisub/windows/util_win.cpp
rename to libaegisub/windows/util_win.cpp
diff --git a/aegisub/m4macros/ac_agi.m4 b/m4macros/ac_agi.m4
similarity index 100%
rename from aegisub/m4macros/ac_agi.m4
rename to m4macros/ac_agi.m4
diff --git a/aegisub/m4macros/ac_agi_mdcpucfg.m4 b/m4macros/ac_agi_mdcpucfg.m4
similarity index 100%
rename from aegisub/m4macros/ac_agi_mdcpucfg.m4
rename to m4macros/ac_agi_mdcpucfg.m4
diff --git a/aegisub/m4macros/ac_flag.m4 b/m4macros/ac_flag.m4
similarity index 100%
rename from aegisub/m4macros/ac_flag.m4
rename to m4macros/ac_flag.m4
diff --git a/aegisub/m4macros/agi_find_libheader.m4 b/m4macros/agi_find_libheader.m4
similarity index 100%
rename from aegisub/m4macros/agi_find_libheader.m4
rename to m4macros/agi_find_libheader.m4
diff --git a/aegisub/m4macros/ax_boost_asio.m4 b/m4macros/ax_boost_asio.m4
similarity index 100%
rename from aegisub/m4macros/ax_boost_asio.m4
rename to m4macros/ax_boost_asio.m4
diff --git a/aegisub/m4macros/ax_boost_base.m4 b/m4macros/ax_boost_base.m4
similarity index 100%
rename from aegisub/m4macros/ax_boost_base.m4
rename to m4macros/ax_boost_base.m4
diff --git a/aegisub/m4macros/ax_boost_chrono.m4 b/m4macros/ax_boost_chrono.m4
similarity index 100%
rename from aegisub/m4macros/ax_boost_chrono.m4
rename to m4macros/ax_boost_chrono.m4
diff --git a/aegisub/m4macros/ax_boost_filesystem.m4 b/m4macros/ax_boost_filesystem.m4
similarity index 100%
rename from aegisub/m4macros/ax_boost_filesystem.m4
rename to m4macros/ax_boost_filesystem.m4
diff --git a/aegisub/m4macros/ax_boost_locale.m4 b/m4macros/ax_boost_locale.m4
similarity index 100%
rename from aegisub/m4macros/ax_boost_locale.m4
rename to m4macros/ax_boost_locale.m4
diff --git a/aegisub/m4macros/ax_boost_regex.m4 b/m4macros/ax_boost_regex.m4
similarity index 100%
rename from aegisub/m4macros/ax_boost_regex.m4
rename to m4macros/ax_boost_regex.m4
diff --git a/aegisub/m4macros/ax_boost_system.m4 b/m4macros/ax_boost_system.m4
similarity index 100%
rename from aegisub/m4macros/ax_boost_system.m4
rename to m4macros/ax_boost_system.m4
diff --git a/aegisub/m4macros/ax_boost_thread.m4 b/m4macros/ax_boost_thread.m4
similarity index 100%
rename from aegisub/m4macros/ax_boost_thread.m4
rename to m4macros/ax_boost_thread.m4
diff --git a/aegisub/m4macros/ax_check_gl.m4 b/m4macros/ax_check_gl.m4
similarity index 100%
rename from aegisub/m4macros/ax_check_gl.m4
rename to m4macros/ax_check_gl.m4
diff --git a/aegisub/m4macros/ax_lang_compiler_ms.m4 b/m4macros/ax_lang_compiler_ms.m4
similarity index 100%
rename from aegisub/m4macros/ax_lang_compiler_ms.m4
rename to m4macros/ax_lang_compiler_ms.m4
diff --git a/aegisub/m4macros/ax_pthread.m4 b/m4macros/ax_pthread.m4
similarity index 100%
rename from aegisub/m4macros/ax_pthread.m4
rename to m4macros/ax_pthread.m4
diff --git a/aegisub/m4macros/check_gnu_make.m4 b/m4macros/check_gnu_make.m4
similarity index 100%
rename from aegisub/m4macros/check_gnu_make.m4
rename to m4macros/check_gnu_make.m4
diff --git a/aegisub/m4macros/wxwin.m4 b/m4macros/wxwin.m4
similarity index 100%
rename from aegisub/m4macros/wxwin.m4
rename to m4macros/wxwin.m4
diff --git a/aegisub/packages/distfile/distfile.sh b/packages/distfile/distfile.sh
similarity index 100%
rename from aegisub/packages/distfile/distfile.sh
rename to packages/distfile/distfile.sh
diff --git a/aegisub/packages/osx_bundle/Contents/Info.plist b/packages/osx_bundle/Contents/Info.plist
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Info.plist
rename to packages/osx_bundle/Contents/Info.plist
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/Aegisub.icns b/packages/osx_bundle/Contents/Resources/Aegisub.icns
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/Aegisub.icns
rename to packages/osx_bundle/Contents/Resources/Aegisub.icns
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/assIcon.icns b/packages/osx_bundle/Contents/Resources/assIcon.icns
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/assIcon.icns
rename to packages/osx_bundle/Contents/Resources/assIcon.icns
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-fix-globaladvance.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-fix-globaladvance.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-fix-globaladvance.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-fix-globaladvance.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-unhint-small-vera.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-unhint-small-vera.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-unhint-small-vera.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-unhint-small-vera.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-metric-aliases.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-metric-aliases.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-metric-aliases.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-metric-aliases.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-urw-aliases.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-urw-aliases.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-urw-aliases.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-urw-aliases.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/40-nonlatin.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/40-nonlatin.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/40-nonlatin.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/40-nonlatin.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/45-latin.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/45-latin.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/45-latin.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/45-latin.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/49-sansserif.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/49-sansserif.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/49-sansserif.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/49-sansserif.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/51-local.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/51-local.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/51-local.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/51-local.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/60-latin.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/60-latin.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/60-latin.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/60-latin.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/65-fonts-persian.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/65-fonts-persian.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/65-fonts-persian.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/65-fonts-persian.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/65-nonlatin.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/65-nonlatin.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/65-nonlatin.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/65-nonlatin.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/69-unifont.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/69-unifont.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/69-unifont.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/69-unifont.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/80-delicious.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/80-delicious.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/80-delicious.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/80-delicious.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/90-synthetic.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/90-synthetic.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/90-synthetic.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/90-synthetic.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf
rename to packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.dtd b/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.dtd
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.dtd
rename to packages/osx_bundle/Contents/Resources/etc/fonts/fonts.dtd
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/srtIcon.icns b/packages/osx_bundle/Contents/Resources/srtIcon.icns
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/srtIcon.icns
rename to packages/osx_bundle/Contents/Resources/srtIcon.icns
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/ssaIcon.icns b/packages/osx_bundle/Contents/Resources/ssaIcon.icns
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/ssaIcon.icns
rename to packages/osx_bundle/Contents/Resources/ssaIcon.icns
diff --git a/aegisub/packages/osx_bundle/Contents/Resources/txtIcon.icns b/packages/osx_bundle/Contents/Resources/txtIcon.icns
similarity index 100%
rename from aegisub/packages/osx_bundle/Contents/Resources/txtIcon.icns
rename to packages/osx_bundle/Contents/Resources/txtIcon.icns
diff --git a/aegisub/packages/osx_dmg/DS_Store b/packages/osx_dmg/DS_Store
similarity index 100%
rename from aegisub/packages/osx_dmg/DS_Store
rename to packages/osx_dmg/DS_Store
diff --git a/aegisub/packages/osx_dmg/dmg_background.png b/packages/osx_dmg/dmg_background.png
similarity index 100%
rename from aegisub/packages/osx_dmg/dmg_background.png
rename to packages/osx_dmg/dmg_background.png
diff --git a/aegisub/packages/osx_dmg/dmg_set_style.applescript b/packages/osx_dmg/dmg_set_style.applescript
similarity index 100%
rename from aegisub/packages/osx_dmg/dmg_set_style.applescript
rename to packages/osx_dmg/dmg_set_style.applescript
diff --git a/aegisub/packages/win_installer/aegisub-large.bmp b/packages/win_installer/aegisub-large.bmp
similarity index 100%
rename from aegisub/packages/win_installer/aegisub-large.bmp
rename to packages/win_installer/aegisub-large.bmp
diff --git a/aegisub/packages/win_installer/aegisub-large.pdn b/packages/win_installer/aegisub-large.pdn
similarity index 100%
rename from aegisub/packages/win_installer/aegisub-large.pdn
rename to packages/win_installer/aegisub-large.pdn
diff --git a/aegisub/packages/win_installer/aegisub.bmp b/packages/win_installer/aegisub.bmp
similarity index 100%
rename from aegisub/packages/win_installer/aegisub.bmp
rename to packages/win_installer/aegisub.bmp
diff --git a/aegisub/packages/win_installer/aegisub.pdn b/packages/win_installer/aegisub.pdn
similarity index 100%
rename from aegisub/packages/win_installer/aegisub.pdn
rename to packages/win_installer/aegisub.pdn
diff --git a/aegisub/packages/win_installer/aegisub3.iss b/packages/win_installer/aegisub3.iss
similarity index 100%
rename from aegisub/packages/win_installer/aegisub3.iss
rename to packages/win_installer/aegisub3.iss
diff --git a/aegisub/packages/win_installer/aegisub3_64.iss b/packages/win_installer/aegisub3_64.iss
similarity index 100%
rename from aegisub/packages/win_installer/aegisub3_64.iss
rename to packages/win_installer/aegisub3_64.iss
diff --git a/aegisub/packages/win_installer/build_dictionary_installers.sh b/packages/win_installer/build_dictionary_installers.sh
similarity index 100%
rename from aegisub/packages/win_installer/build_dictionary_installers.sh
rename to packages/win_installer/build_dictionary_installers.sh
diff --git a/aegisub/packages/win_installer/dictionaries/fragment_dictbase.iss b/packages/win_installer/dictionaries/fragment_dictbase.iss
similarity index 100%
rename from aegisub/packages/win_installer/dictionaries/fragment_dictbase.iss
rename to packages/win_installer/dictionaries/fragment_dictbase.iss
diff --git a/aegisub/packages/win_installer/dictionaries/fragment_stddict.iss b/packages/win_installer/dictionaries/fragment_stddict.iss
similarity index 100%
rename from aegisub/packages/win_installer/dictionaries/fragment_stddict.iss
rename to packages/win_installer/dictionaries/fragment_stddict.iss
diff --git a/aegisub/packages/win_installer/dictionaries/sr_SR.iss b/packages/win_installer/dictionaries/sr_SR.iss
similarity index 100%
rename from aegisub/packages/win_installer/dictionaries/sr_SR.iss
rename to packages/win_installer/dictionaries/sr_SR.iss
diff --git a/aegisub/packages/win_installer/fragment_assdraw.iss b/packages/win_installer/fragment_assdraw.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_assdraw.iss
rename to packages/win_installer/fragment_assdraw.iss
diff --git a/aegisub/packages/win_installer/fragment_associations.iss b/packages/win_installer/fragment_associations.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_associations.iss
rename to packages/win_installer/fragment_associations.iss
diff --git a/aegisub/packages/win_installer/fragment_automation.iss b/packages/win_installer/fragment_automation.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_automation.iss
rename to packages/win_installer/fragment_automation.iss
diff --git a/aegisub/packages/win_installer/fragment_beautify_code.iss b/packages/win_installer/fragment_beautify_code.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_beautify_code.iss
rename to packages/win_installer/fragment_beautify_code.iss
diff --git a/aegisub/packages/win_installer/fragment_codecs_32.iss b/packages/win_installer/fragment_codecs_32.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_codecs_32.iss
rename to packages/win_installer/fragment_codecs_32.iss
diff --git a/aegisub/packages/win_installer/fragment_codecs_64.iss b/packages/win_installer/fragment_codecs_64.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_codecs_64.iss
rename to packages/win_installer/fragment_codecs_64.iss
diff --git a/aegisub/packages/win_installer/fragment_mainprogram.iss b/packages/win_installer/fragment_mainprogram.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_mainprogram.iss
rename to packages/win_installer/fragment_mainprogram.iss
diff --git a/aegisub/packages/win_installer/fragment_migrate_code.iss b/packages/win_installer/fragment_migrate_code.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_migrate_code.iss
rename to packages/win_installer/fragment_migrate_code.iss
diff --git a/aegisub/packages/win_installer/fragment_opengl.iss b/packages/win_installer/fragment_opengl.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_opengl.iss
rename to packages/win_installer/fragment_opengl.iss
diff --git a/aegisub/packages/win_installer/fragment_runtimes.iss b/packages/win_installer/fragment_runtimes.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_runtimes.iss
rename to packages/win_installer/fragment_runtimes.iss
diff --git a/aegisub/packages/win_installer/fragment_setupbase.iss b/packages/win_installer/fragment_setupbase.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_setupbase.iss
rename to packages/win_installer/fragment_setupbase.iss
diff --git a/aegisub/packages/win_installer/fragment_shell_code.iss b/packages/win_installer/fragment_shell_code.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_shell_code.iss
rename to packages/win_installer/fragment_shell_code.iss
diff --git a/aegisub/packages/win_installer/fragment_spelling.iss b/packages/win_installer/fragment_spelling.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_spelling.iss
rename to packages/win_installer/fragment_spelling.iss
diff --git a/aegisub/packages/win_installer/fragment_translations.iss b/packages/win_installer/fragment_translations.iss
similarity index 100%
rename from aegisub/packages/win_installer/fragment_translations.iss
rename to packages/win_installer/fragment_translations.iss
diff --git a/aegisub/packages/win_installer/legacy_dirlist.txt b/packages/win_installer/legacy_dirlist.txt
similarity index 100%
rename from aegisub/packages/win_installer/legacy_dirlist.txt
rename to packages/win_installer/legacy_dirlist.txt
diff --git a/aegisub/packages/win_installer/legacy_filelist.txt b/packages/win_installer/legacy_filelist.txt
similarity index 100%
rename from aegisub/packages/win_installer/legacy_filelist.txt
rename to packages/win_installer/legacy_filelist.txt
diff --git a/aegisub/packages/win_installer/legacy_locales.txt b/packages/win_installer/legacy_locales.txt
similarity index 100%
rename from aegisub/packages/win_installer/legacy_locales.txt
rename to packages/win_installer/legacy_locales.txt
diff --git a/aegisub/packages/win_installer/legacy_shortcutlist.txt b/packages/win_installer/legacy_shortcutlist.txt
similarity index 100%
rename from aegisub/packages/win_installer/legacy_shortcutlist.txt
rename to packages/win_installer/legacy_shortcutlist.txt
diff --git a/aegisub/packages/win_installer/license.txt b/packages/win_installer/license.txt
similarity index 100%
rename from aegisub/packages/win_installer/license.txt
rename to packages/win_installer/license.txt
diff --git a/aegisub/packages/win_installer/old_dirlist.txt b/packages/win_installer/old_dirlist.txt
similarity index 100%
rename from aegisub/packages/win_installer/old_dirlist.txt
rename to packages/win_installer/old_dirlist.txt
diff --git a/aegisub/packages/win_installer/old_filelist.txt b/packages/win_installer/old_filelist.txt
similarity index 100%
rename from aegisub/packages/win_installer/old_filelist.txt
rename to packages/win_installer/old_filelist.txt
diff --git a/aegisub/packages/win_installer/old_locales.txt b/packages/win_installer/old_locales.txt
similarity index 100%
rename from aegisub/packages/win_installer/old_locales.txt
rename to packages/win_installer/old_locales.txt
diff --git a/aegisub/packages/win_installer/old_shortcutlist.txt b/packages/win_installer/old_shortcutlist.txt
similarity index 100%
rename from aegisub/packages/win_installer/old_shortcutlist.txt
rename to packages/win_installer/old_shortcutlist.txt
diff --git a/aegisub/packages/win_installer/portable/config.json b/packages/win_installer/portable/config.json
similarity index 100%
rename from aegisub/packages/win_installer/portable/config.json
rename to packages/win_installer/portable/config.json
diff --git a/aegisub/packages/win_installer/portable/create-portable-64.bat b/packages/win_installer/portable/create-portable-64.bat
similarity index 100%
rename from aegisub/packages/win_installer/portable/create-portable-64.bat
rename to packages/win_installer/portable/create-portable-64.bat
diff --git a/aegisub/packages/win_installer/portable/create-portable.bat b/packages/win_installer/portable/create-portable.bat
similarity index 100%
rename from aegisub/packages/win_installer/portable/create-portable.bat
rename to packages/win_installer/portable/create-portable.bat
diff --git a/aegisub/packages/win_installer/portable/icon.ico b/packages/win_installer/portable/icon.ico
similarity index 100%
rename from aegisub/packages/win_installer/portable/icon.ico
rename to packages/win_installer/portable/icon.ico
diff --git a/aegisub/packages/win_installer/portable/portable-comment.txt b/packages/win_installer/portable/portable-comment.txt
similarity index 100%
rename from aegisub/packages/win_installer/portable/portable-comment.txt
rename to packages/win_installer/portable/portable-comment.txt
diff --git a/aegisub/packages/win_installer/portable/side-logo.bmp b/packages/win_installer/portable/side-logo.bmp
similarity index 100%
rename from aegisub/packages/win_installer/portable/side-logo.bmp
rename to packages/win_installer/portable/side-logo.bmp
diff --git a/aegisub/packages/win_installer/template.ass b/packages/win_installer/template.ass
similarity index 100%
rename from aegisub/packages/win_installer/template.ass
rename to packages/win_installer/template.ass
diff --git a/aegisub/packages/win_installer/welcome-large.bmp b/packages/win_installer/welcome-large.bmp
similarity index 100%
rename from aegisub/packages/win_installer/welcome-large.bmp
rename to packages/win_installer/welcome-large.bmp
diff --git a/aegisub/packages/win_installer/welcome-large.pdn b/packages/win_installer/welcome-large.pdn
similarity index 100%
rename from aegisub/packages/win_installer/welcome-large.pdn
rename to packages/win_installer/welcome-large.pdn
diff --git a/aegisub/packages/win_installer/welcome.bmp b/packages/win_installer/welcome.bmp
similarity index 100%
rename from aegisub/packages/win_installer/welcome.bmp
rename to packages/win_installer/welcome.bmp
diff --git a/aegisub/packages/win_installer/welcome.pdn b/packages/win_installer/welcome.pdn
similarity index 100%
rename from aegisub/packages/win_installer/welcome.pdn
rename to packages/win_installer/welcome.pdn
diff --git a/aegisub/po/Makefile b/po/Makefile
similarity index 100%
rename from aegisub/po/Makefile
rename to po/Makefile
diff --git a/aegisub/po/README_ja.txt b/po/README_ja.txt
similarity index 100%
rename from aegisub/po/README_ja.txt
rename to po/README_ja.txt
diff --git a/aegisub/po/aegisub.pot b/po/aegisub.pot
similarity index 100%
rename from aegisub/po/aegisub.pot
rename to po/aegisub.pot
diff --git a/aegisub/po/ar.po b/po/ar.po
similarity index 100%
rename from aegisub/po/ar.po
rename to po/ar.po
diff --git a/aegisub/po/bg.po b/po/bg.po
similarity index 100%
rename from aegisub/po/bg.po
rename to po/bg.po
diff --git a/aegisub/po/ca.po b/po/ca.po
similarity index 100%
rename from aegisub/po/ca.po
rename to po/ca.po
diff --git a/aegisub/po/cs.po b/po/cs.po
similarity index 100%
rename from aegisub/po/cs.po
rename to po/cs.po
diff --git a/aegisub/po/da.po b/po/da.po
similarity index 100%
rename from aegisub/po/da.po
rename to po/da.po
diff --git a/aegisub/po/de.po b/po/de.po
similarity index 100%
rename from aegisub/po/de.po
rename to po/de.po
diff --git a/aegisub/po/el.po b/po/el.po
similarity index 100%
rename from aegisub/po/el.po
rename to po/el.po
diff --git a/aegisub/po/es.po b/po/es.po
similarity index 100%
rename from aegisub/po/es.po
rename to po/es.po
diff --git a/aegisub/po/eu.po b/po/eu.po
similarity index 100%
rename from aegisub/po/eu.po
rename to po/eu.po
diff --git a/aegisub/po/fa.po b/po/fa.po
similarity index 100%
rename from aegisub/po/fa.po
rename to po/fa.po
diff --git a/aegisub/po/fi.po b/po/fi.po
similarity index 100%
rename from aegisub/po/fi.po
rename to po/fi.po
diff --git a/aegisub/po/fr_FR.po b/po/fr_FR.po
similarity index 100%
rename from aegisub/po/fr_FR.po
rename to po/fr_FR.po
diff --git a/aegisub/po/gl.po b/po/gl.po
similarity index 100%
rename from aegisub/po/gl.po
rename to po/gl.po
diff --git a/aegisub/po/hu.po b/po/hu.po
similarity index 100%
rename from aegisub/po/hu.po
rename to po/hu.po
diff --git a/aegisub/po/id.po b/po/id.po
similarity index 100%
rename from aegisub/po/id.po
rename to po/id.po
diff --git a/aegisub/po/it.po b/po/it.po
similarity index 100%
rename from aegisub/po/it.po
rename to po/it.po
diff --git a/aegisub/po/ja.po b/po/ja.po
similarity index 100%
rename from aegisub/po/ja.po
rename to po/ja.po
diff --git a/aegisub/po/ko.po b/po/ko.po
similarity index 100%
rename from aegisub/po/ko.po
rename to po/ko.po
diff --git a/aegisub/po/make_pot.sh b/po/make_pot.sh
similarity index 100%
rename from aegisub/po/make_pot.sh
rename to po/make_pot.sh
diff --git a/aegisub/po/nl.po b/po/nl.po
similarity index 100%
rename from aegisub/po/nl.po
rename to po/nl.po
diff --git a/aegisub/po/pl.po b/po/pl.po
similarity index 100%
rename from aegisub/po/pl.po
rename to po/pl.po
diff --git a/aegisub/po/pt_BR.po b/po/pt_BR.po
similarity index 100%
rename from aegisub/po/pt_BR.po
rename to po/pt_BR.po
diff --git a/aegisub/po/pt_PT.po b/po/pt_PT.po
similarity index 100%
rename from aegisub/po/pt_PT.po
rename to po/pt_PT.po
diff --git a/aegisub/po/ru.po b/po/ru.po
similarity index 100%
rename from aegisub/po/ru.po
rename to po/ru.po
diff --git a/aegisub/po/sr_RS.po b/po/sr_RS.po
similarity index 100%
rename from aegisub/po/sr_RS.po
rename to po/sr_RS.po
diff --git a/aegisub/po/sr_RS@latin.po b/po/sr_RS@latin.po
similarity index 100%
rename from aegisub/po/sr_RS@latin.po
rename to po/sr_RS@latin.po
diff --git a/aegisub/po/stats.sh b/po/stats.sh
similarity index 100%
rename from aegisub/po/stats.sh
rename to po/stats.sh
diff --git a/aegisub/po/vi.po b/po/vi.po
similarity index 100%
rename from aegisub/po/vi.po
rename to po/vi.po
diff --git a/aegisub/po/zh_CN.po b/po/zh_CN.po
similarity index 100%
rename from aegisub/po/zh_CN.po
rename to po/zh_CN.po
diff --git a/aegisub/po/zh_TW.po b/po/zh_TW.po
similarity index 100%
rename from aegisub/po/zh_TW.po
rename to po/zh_TW.po
diff --git a/aegisub/reporter/Makefile b/reporter/Makefile
similarity index 100%
rename from aegisub/reporter/Makefile
rename to reporter/Makefile
diff --git a/aegisub/reporter/aegisub.cpp b/reporter/aegisub.cpp
similarity index 100%
rename from aegisub/reporter/aegisub.cpp
rename to reporter/aegisub.cpp
diff --git a/aegisub/reporter/aegisub.h b/reporter/aegisub.h
similarity index 100%
rename from aegisub/reporter/aegisub.h
rename to reporter/aegisub.h
diff --git a/aegisub/reporter/include/platform.h b/reporter/include/platform.h
similarity index 100%
rename from aegisub/reporter/include/platform.h
rename to reporter/include/platform.h
diff --git a/aegisub/reporter/libraries.cpp b/reporter/libraries.cpp
similarity index 100%
rename from aegisub/reporter/libraries.cpp
rename to reporter/libraries.cpp
diff --git a/aegisub/reporter/main.cpp b/reporter/main.cpp
similarity index 100%
rename from aegisub/reporter/main.cpp
rename to reporter/main.cpp
diff --git a/aegisub/reporter/main.h b/reporter/main.h
similarity index 100%
rename from aegisub/reporter/main.h
rename to reporter/main.h
diff --git a/aegisub/reporter/platform.cpp b/reporter/platform.cpp
similarity index 100%
rename from aegisub/reporter/platform.cpp
rename to reporter/platform.cpp
diff --git a/aegisub/reporter/platform_unix.cpp b/reporter/platform_unix.cpp
similarity index 100%
rename from aegisub/reporter/platform_unix.cpp
rename to reporter/platform_unix.cpp
diff --git a/aegisub/reporter/platform_unix.h b/reporter/platform_unix.h
similarity index 100%
rename from aegisub/reporter/platform_unix.h
rename to reporter/platform_unix.h
diff --git a/aegisub/reporter/platform_unix_bsd.cpp b/reporter/platform_unix_bsd.cpp
similarity index 100%
rename from aegisub/reporter/platform_unix_bsd.cpp
rename to reporter/platform_unix_bsd.cpp
diff --git a/aegisub/reporter/platform_unix_bsd.h b/reporter/platform_unix_bsd.h
similarity index 100%
rename from aegisub/reporter/platform_unix_bsd.h
rename to reporter/platform_unix_bsd.h
diff --git a/aegisub/reporter/platform_unix_linux.cpp b/reporter/platform_unix_linux.cpp
similarity index 100%
rename from aegisub/reporter/platform_unix_linux.cpp
rename to reporter/platform_unix_linux.cpp
diff --git a/aegisub/reporter/platform_unix_linux.h b/reporter/platform_unix_linux.h
similarity index 100%
rename from aegisub/reporter/platform_unix_linux.h
rename to reporter/platform_unix_linux.h
diff --git a/aegisub/reporter/platform_unix_osx.cpp b/reporter/platform_unix_osx.cpp
similarity index 100%
rename from aegisub/reporter/platform_unix_osx.cpp
rename to reporter/platform_unix_osx.cpp
diff --git a/aegisub/reporter/platform_unix_osx.h b/reporter/platform_unix_osx.h
similarity index 100%
rename from aegisub/reporter/platform_unix_osx.h
rename to reporter/platform_unix_osx.h
diff --git a/aegisub/reporter/platform_windows.cpp b/reporter/platform_windows.cpp
similarity index 100%
rename from aegisub/reporter/platform_windows.cpp
rename to reporter/platform_windows.cpp
diff --git a/aegisub/reporter/platform_windows.h b/reporter/platform_windows.h
similarity index 100%
rename from aegisub/reporter/platform_windows.h
rename to reporter/platform_windows.h
diff --git a/aegisub/reporter/progress.cpp b/reporter/progress.cpp
similarity index 100%
rename from aegisub/reporter/progress.cpp
rename to reporter/progress.cpp
diff --git a/aegisub/reporter/progress.h b/reporter/progress.h
similarity index 100%
rename from aegisub/reporter/progress.h
rename to reporter/progress.h
diff --git a/aegisub/reporter/r_pre.cpp b/reporter/r_pre.cpp
similarity index 100%
rename from aegisub/reporter/r_pre.cpp
rename to reporter/r_pre.cpp
diff --git a/aegisub/reporter/r_pre.h b/reporter/r_pre.h
similarity index 100%
rename from aegisub/reporter/r_pre.h
rename to reporter/r_pre.h
diff --git a/aegisub/reporter/report.cpp b/reporter/report.cpp
similarity index 100%
rename from aegisub/reporter/report.cpp
rename to reporter/report.cpp
diff --git a/aegisub/reporter/report.h b/reporter/report.h
similarity index 100%
rename from aegisub/reporter/report.h
rename to reporter/report.h
diff --git a/aegisub/reporter/sha256.c b/reporter/sha256.c
similarity index 100%
rename from aegisub/reporter/sha256.c
rename to reporter/sha256.c
diff --git a/aegisub/reporter/sha256.h b/reporter/sha256.h
similarity index 100%
rename from aegisub/reporter/sha256.h
rename to reporter/sha256.h
diff --git a/aegisub/reporter/upload.cpp b/reporter/upload.cpp
similarity index 100%
rename from aegisub/reporter/upload.cpp
rename to reporter/upload.cpp
diff --git a/aegisub/reporter/upload.h b/reporter/upload.h
similarity index 100%
rename from aegisub/reporter/upload.h
rename to reporter/upload.h
diff --git a/aegisub/reporter/util.cpp b/reporter/util.cpp
similarity index 100%
rename from aegisub/reporter/util.cpp
rename to reporter/util.cpp
diff --git a/aegisub/reporter/util.h b/reporter/util.h
similarity index 100%
rename from aegisub/reporter/util.h
rename to reporter/util.h
diff --git a/aegisub/reporter/view.cpp b/reporter/view.cpp
similarity index 100%
rename from aegisub/reporter/view.cpp
rename to reporter/view.cpp
diff --git a/aegisub/reporter/view.h b/reporter/view.h
similarity index 100%
rename from aegisub/reporter/view.h
rename to reporter/view.h
diff --git a/aegisub/src/Makefile b/src/Makefile
similarity index 100%
rename from aegisub/src/Makefile
rename to src/Makefile
diff --git a/aegisub/src/MatroskaParser.c b/src/MatroskaParser.c
similarity index 100%
rename from aegisub/src/MatroskaParser.c
rename to src/MatroskaParser.c
diff --git a/aegisub/src/MatroskaParser.h b/src/MatroskaParser.h
similarity index 100%
rename from aegisub/src/MatroskaParser.h
rename to src/MatroskaParser.h
diff --git a/aegisub/src/aegisublocale.cpp b/src/aegisublocale.cpp
similarity index 100%
rename from aegisub/src/aegisublocale.cpp
rename to src/aegisublocale.cpp
diff --git a/aegisub/src/aegisublocale.h b/src/aegisublocale.h
similarity index 100%
rename from aegisub/src/aegisublocale.h
rename to src/aegisublocale.h
diff --git a/aegisub/src/agi_pre.cpp b/src/agi_pre.cpp
similarity index 100%
rename from aegisub/src/agi_pre.cpp
rename to src/agi_pre.cpp
diff --git a/aegisub/src/agi_pre.h b/src/agi_pre.h
similarity index 100%
rename from aegisub/src/agi_pre.h
rename to src/agi_pre.h
diff --git a/aegisub/src/ass_attachment.cpp b/src/ass_attachment.cpp
similarity index 100%
rename from aegisub/src/ass_attachment.cpp
rename to src/ass_attachment.cpp
diff --git a/aegisub/src/ass_attachment.h b/src/ass_attachment.h
similarity index 100%
rename from aegisub/src/ass_attachment.h
rename to src/ass_attachment.h
diff --git a/aegisub/src/ass_dialogue.cpp b/src/ass_dialogue.cpp
similarity index 100%
rename from aegisub/src/ass_dialogue.cpp
rename to src/ass_dialogue.cpp
diff --git a/aegisub/src/ass_dialogue.h b/src/ass_dialogue.h
similarity index 100%
rename from aegisub/src/ass_dialogue.h
rename to src/ass_dialogue.h
diff --git a/aegisub/src/ass_entry.cpp b/src/ass_entry.cpp
similarity index 100%
rename from aegisub/src/ass_entry.cpp
rename to src/ass_entry.cpp
diff --git a/aegisub/src/ass_entry.h b/src/ass_entry.h
similarity index 100%
rename from aegisub/src/ass_entry.h
rename to src/ass_entry.h
diff --git a/aegisub/src/ass_export_filter.cpp b/src/ass_export_filter.cpp
similarity index 100%
rename from aegisub/src/ass_export_filter.cpp
rename to src/ass_export_filter.cpp
diff --git a/aegisub/src/ass_export_filter.h b/src/ass_export_filter.h
similarity index 100%
rename from aegisub/src/ass_export_filter.h
rename to src/ass_export_filter.h
diff --git a/aegisub/src/ass_exporter.cpp b/src/ass_exporter.cpp
similarity index 100%
rename from aegisub/src/ass_exporter.cpp
rename to src/ass_exporter.cpp
diff --git a/aegisub/src/ass_exporter.h b/src/ass_exporter.h
similarity index 100%
rename from aegisub/src/ass_exporter.h
rename to src/ass_exporter.h
diff --git a/aegisub/src/ass_file.cpp b/src/ass_file.cpp
similarity index 100%
rename from aegisub/src/ass_file.cpp
rename to src/ass_file.cpp
diff --git a/aegisub/src/ass_file.h b/src/ass_file.h
similarity index 100%
rename from aegisub/src/ass_file.h
rename to src/ass_file.h
diff --git a/aegisub/src/ass_info.h b/src/ass_info.h
similarity index 100%
rename from aegisub/src/ass_info.h
rename to src/ass_info.h
diff --git a/aegisub/src/ass_karaoke.cpp b/src/ass_karaoke.cpp
similarity index 100%
rename from aegisub/src/ass_karaoke.cpp
rename to src/ass_karaoke.cpp
diff --git a/aegisub/src/ass_karaoke.h b/src/ass_karaoke.h
similarity index 100%
rename from aegisub/src/ass_karaoke.h
rename to src/ass_karaoke.h
diff --git a/aegisub/src/ass_override.cpp b/src/ass_override.cpp
similarity index 100%
rename from aegisub/src/ass_override.cpp
rename to src/ass_override.cpp
diff --git a/aegisub/src/ass_override.h b/src/ass_override.h
similarity index 100%
rename from aegisub/src/ass_override.h
rename to src/ass_override.h
diff --git a/aegisub/src/ass_parser.cpp b/src/ass_parser.cpp
similarity index 100%
rename from aegisub/src/ass_parser.cpp
rename to src/ass_parser.cpp
diff --git a/aegisub/src/ass_parser.h b/src/ass_parser.h
similarity index 100%
rename from aegisub/src/ass_parser.h
rename to src/ass_parser.h
diff --git a/aegisub/src/ass_style.cpp b/src/ass_style.cpp
similarity index 100%
rename from aegisub/src/ass_style.cpp
rename to src/ass_style.cpp
diff --git a/aegisub/src/ass_style.h b/src/ass_style.h
similarity index 100%
rename from aegisub/src/ass_style.h
rename to src/ass_style.h
diff --git a/aegisub/src/ass_style_storage.cpp b/src/ass_style_storage.cpp
similarity index 100%
rename from aegisub/src/ass_style_storage.cpp
rename to src/ass_style_storage.cpp
diff --git a/aegisub/src/ass_style_storage.h b/src/ass_style_storage.h
similarity index 100%
rename from aegisub/src/ass_style_storage.h
rename to src/ass_style_storage.h
diff --git a/aegisub/src/ass_time.cpp b/src/ass_time.cpp
similarity index 100%
rename from aegisub/src/ass_time.cpp
rename to src/ass_time.cpp
diff --git a/aegisub/src/ass_time.h b/src/ass_time.h
similarity index 100%
rename from aegisub/src/ass_time.h
rename to src/ass_time.h
diff --git a/aegisub/src/audio_box.cpp b/src/audio_box.cpp
similarity index 100%
rename from aegisub/src/audio_box.cpp
rename to src/audio_box.cpp
diff --git a/aegisub/src/audio_box.h b/src/audio_box.h
similarity index 100%
rename from aegisub/src/audio_box.h
rename to src/audio_box.h
diff --git a/aegisub/src/audio_colorscheme.cpp b/src/audio_colorscheme.cpp
similarity index 100%
rename from aegisub/src/audio_colorscheme.cpp
rename to src/audio_colorscheme.cpp
diff --git a/aegisub/src/audio_colorscheme.h b/src/audio_colorscheme.h
similarity index 100%
rename from aegisub/src/audio_colorscheme.h
rename to src/audio_colorscheme.h
diff --git a/aegisub/src/audio_controller.cpp b/src/audio_controller.cpp
similarity index 100%
rename from aegisub/src/audio_controller.cpp
rename to src/audio_controller.cpp
diff --git a/aegisub/src/audio_controller.h b/src/audio_controller.h
similarity index 100%
rename from aegisub/src/audio_controller.h
rename to src/audio_controller.h
diff --git a/aegisub/src/audio_display.cpp b/src/audio_display.cpp
similarity index 100%
rename from aegisub/src/audio_display.cpp
rename to src/audio_display.cpp
diff --git a/aegisub/src/audio_display.h b/src/audio_display.h
similarity index 100%
rename from aegisub/src/audio_display.h
rename to src/audio_display.h
diff --git a/aegisub/src/audio_karaoke.cpp b/src/audio_karaoke.cpp
similarity index 100%
rename from aegisub/src/audio_karaoke.cpp
rename to src/audio_karaoke.cpp
diff --git a/aegisub/src/audio_karaoke.h b/src/audio_karaoke.h
similarity index 100%
rename from aegisub/src/audio_karaoke.h
rename to src/audio_karaoke.h
diff --git a/aegisub/src/audio_marker.cpp b/src/audio_marker.cpp
similarity index 100%
rename from aegisub/src/audio_marker.cpp
rename to src/audio_marker.cpp
diff --git a/aegisub/src/audio_marker.h b/src/audio_marker.h
similarity index 100%
rename from aegisub/src/audio_marker.h
rename to src/audio_marker.h
diff --git a/aegisub/src/audio_player.cpp b/src/audio_player.cpp
similarity index 100%
rename from aegisub/src/audio_player.cpp
rename to src/audio_player.cpp
diff --git a/aegisub/src/audio_player_alsa.cpp b/src/audio_player_alsa.cpp
similarity index 100%
rename from aegisub/src/audio_player_alsa.cpp
rename to src/audio_player_alsa.cpp
diff --git a/aegisub/src/audio_player_alsa.h b/src/audio_player_alsa.h
similarity index 100%
rename from aegisub/src/audio_player_alsa.h
rename to src/audio_player_alsa.h
diff --git a/aegisub/src/audio_player_dsound.cpp b/src/audio_player_dsound.cpp
similarity index 100%
rename from aegisub/src/audio_player_dsound.cpp
rename to src/audio_player_dsound.cpp
diff --git a/aegisub/src/audio_player_dsound.h b/src/audio_player_dsound.h
similarity index 100%
rename from aegisub/src/audio_player_dsound.h
rename to src/audio_player_dsound.h
diff --git a/aegisub/src/audio_player_dsound2.cpp b/src/audio_player_dsound2.cpp
similarity index 100%
rename from aegisub/src/audio_player_dsound2.cpp
rename to src/audio_player_dsound2.cpp
diff --git a/aegisub/src/audio_player_dsound2.h b/src/audio_player_dsound2.h
similarity index 100%
rename from aegisub/src/audio_player_dsound2.h
rename to src/audio_player_dsound2.h
diff --git a/aegisub/src/audio_player_openal.cpp b/src/audio_player_openal.cpp
similarity index 100%
rename from aegisub/src/audio_player_openal.cpp
rename to src/audio_player_openal.cpp
diff --git a/aegisub/src/audio_player_openal.h b/src/audio_player_openal.h
similarity index 100%
rename from aegisub/src/audio_player_openal.h
rename to src/audio_player_openal.h
diff --git a/aegisub/src/audio_player_oss.cpp b/src/audio_player_oss.cpp
similarity index 100%
rename from aegisub/src/audio_player_oss.cpp
rename to src/audio_player_oss.cpp
diff --git a/aegisub/src/audio_player_oss.h b/src/audio_player_oss.h
similarity index 100%
rename from aegisub/src/audio_player_oss.h
rename to src/audio_player_oss.h
diff --git a/aegisub/src/audio_player_portaudio.cpp b/src/audio_player_portaudio.cpp
similarity index 100%
rename from aegisub/src/audio_player_portaudio.cpp
rename to src/audio_player_portaudio.cpp
diff --git a/aegisub/src/audio_player_portaudio.h b/src/audio_player_portaudio.h
similarity index 100%
rename from aegisub/src/audio_player_portaudio.h
rename to src/audio_player_portaudio.h
diff --git a/aegisub/src/audio_player_pulse.cpp b/src/audio_player_pulse.cpp
similarity index 100%
rename from aegisub/src/audio_player_pulse.cpp
rename to src/audio_player_pulse.cpp
diff --git a/aegisub/src/audio_player_pulse.h b/src/audio_player_pulse.h
similarity index 100%
rename from aegisub/src/audio_player_pulse.h
rename to src/audio_player_pulse.h
diff --git a/aegisub/src/audio_provider.cpp b/src/audio_provider.cpp
similarity index 100%
rename from aegisub/src/audio_provider.cpp
rename to src/audio_provider.cpp
diff --git a/aegisub/src/audio_provider_avs.cpp b/src/audio_provider_avs.cpp
similarity index 100%
rename from aegisub/src/audio_provider_avs.cpp
rename to src/audio_provider_avs.cpp
diff --git a/aegisub/src/audio_provider_avs.h b/src/audio_provider_avs.h
similarity index 100%
rename from aegisub/src/audio_provider_avs.h
rename to src/audio_provider_avs.h
diff --git a/aegisub/src/audio_provider_convert.cpp b/src/audio_provider_convert.cpp
similarity index 100%
rename from aegisub/src/audio_provider_convert.cpp
rename to src/audio_provider_convert.cpp
diff --git a/aegisub/src/audio_provider_convert.h b/src/audio_provider_convert.h
similarity index 100%
rename from aegisub/src/audio_provider_convert.h
rename to src/audio_provider_convert.h
diff --git a/aegisub/src/audio_provider_dummy.cpp b/src/audio_provider_dummy.cpp
similarity index 100%
rename from aegisub/src/audio_provider_dummy.cpp
rename to src/audio_provider_dummy.cpp
diff --git a/aegisub/src/audio_provider_dummy.h b/src/audio_provider_dummy.h
similarity index 100%
rename from aegisub/src/audio_provider_dummy.h
rename to src/audio_provider_dummy.h
diff --git a/aegisub/src/audio_provider_ffmpegsource.cpp b/src/audio_provider_ffmpegsource.cpp
similarity index 100%
rename from aegisub/src/audio_provider_ffmpegsource.cpp
rename to src/audio_provider_ffmpegsource.cpp
diff --git a/aegisub/src/audio_provider_ffmpegsource.h b/src/audio_provider_ffmpegsource.h
similarity index 100%
rename from aegisub/src/audio_provider_ffmpegsource.h
rename to src/audio_provider_ffmpegsource.h
diff --git a/aegisub/src/audio_provider_hd.cpp b/src/audio_provider_hd.cpp
similarity index 100%
rename from aegisub/src/audio_provider_hd.cpp
rename to src/audio_provider_hd.cpp
diff --git a/aegisub/src/audio_provider_hd.h b/src/audio_provider_hd.h
similarity index 100%
rename from aegisub/src/audio_provider_hd.h
rename to src/audio_provider_hd.h
diff --git a/aegisub/src/audio_provider_lock.cpp b/src/audio_provider_lock.cpp
similarity index 100%
rename from aegisub/src/audio_provider_lock.cpp
rename to src/audio_provider_lock.cpp
diff --git a/aegisub/src/audio_provider_lock.h b/src/audio_provider_lock.h
similarity index 100%
rename from aegisub/src/audio_provider_lock.h
rename to src/audio_provider_lock.h
diff --git a/aegisub/src/audio_provider_pcm.cpp b/src/audio_provider_pcm.cpp
similarity index 100%
rename from aegisub/src/audio_provider_pcm.cpp
rename to src/audio_provider_pcm.cpp
diff --git a/aegisub/src/audio_provider_pcm.h b/src/audio_provider_pcm.h
similarity index 100%
rename from aegisub/src/audio_provider_pcm.h
rename to src/audio_provider_pcm.h
diff --git a/aegisub/src/audio_provider_ram.cpp b/src/audio_provider_ram.cpp
similarity index 100%
rename from aegisub/src/audio_provider_ram.cpp
rename to src/audio_provider_ram.cpp
diff --git a/aegisub/src/audio_provider_ram.h b/src/audio_provider_ram.h
similarity index 100%
rename from aegisub/src/audio_provider_ram.h
rename to src/audio_provider_ram.h
diff --git a/aegisub/src/audio_renderer.cpp b/src/audio_renderer.cpp
similarity index 100%
rename from aegisub/src/audio_renderer.cpp
rename to src/audio_renderer.cpp
diff --git a/aegisub/src/audio_renderer.h b/src/audio_renderer.h
similarity index 100%
rename from aegisub/src/audio_renderer.h
rename to src/audio_renderer.h
diff --git a/aegisub/src/audio_renderer_spectrum.cpp b/src/audio_renderer_spectrum.cpp
similarity index 100%
rename from aegisub/src/audio_renderer_spectrum.cpp
rename to src/audio_renderer_spectrum.cpp
diff --git a/aegisub/src/audio_renderer_spectrum.h b/src/audio_renderer_spectrum.h
similarity index 100%
rename from aegisub/src/audio_renderer_spectrum.h
rename to src/audio_renderer_spectrum.h
diff --git a/aegisub/src/audio_renderer_waveform.cpp b/src/audio_renderer_waveform.cpp
similarity index 100%
rename from aegisub/src/audio_renderer_waveform.cpp
rename to src/audio_renderer_waveform.cpp
diff --git a/aegisub/src/audio_renderer_waveform.h b/src/audio_renderer_waveform.h
similarity index 100%
rename from aegisub/src/audio_renderer_waveform.h
rename to src/audio_renderer_waveform.h
diff --git a/aegisub/src/audio_rendering_style.h b/src/audio_rendering_style.h
similarity index 100%
rename from aegisub/src/audio_rendering_style.h
rename to src/audio_rendering_style.h
diff --git a/aegisub/src/audio_timing.h b/src/audio_timing.h
similarity index 100%
rename from aegisub/src/audio_timing.h
rename to src/audio_timing.h
diff --git a/aegisub/src/audio_timing_dialogue.cpp b/src/audio_timing_dialogue.cpp
similarity index 100%
rename from aegisub/src/audio_timing_dialogue.cpp
rename to src/audio_timing_dialogue.cpp
diff --git a/aegisub/src/audio_timing_karaoke.cpp b/src/audio_timing_karaoke.cpp
similarity index 100%
rename from aegisub/src/audio_timing_karaoke.cpp
rename to src/audio_timing_karaoke.cpp
diff --git a/aegisub/src/auto4_base.cpp b/src/auto4_base.cpp
similarity index 100%
rename from aegisub/src/auto4_base.cpp
rename to src/auto4_base.cpp
diff --git a/aegisub/src/auto4_base.h b/src/auto4_base.h
similarity index 100%
rename from aegisub/src/auto4_base.h
rename to src/auto4_base.h
diff --git a/aegisub/src/auto4_lua.cpp b/src/auto4_lua.cpp
similarity index 100%
rename from aegisub/src/auto4_lua.cpp
rename to src/auto4_lua.cpp
diff --git a/aegisub/src/auto4_lua.h b/src/auto4_lua.h
similarity index 100%
rename from aegisub/src/auto4_lua.h
rename to src/auto4_lua.h
diff --git a/aegisub/src/auto4_lua_assfile.cpp b/src/auto4_lua_assfile.cpp
similarity index 100%
rename from aegisub/src/auto4_lua_assfile.cpp
rename to src/auto4_lua_assfile.cpp
diff --git a/aegisub/src/auto4_lua_dialog.cpp b/src/auto4_lua_dialog.cpp
similarity index 100%
rename from aegisub/src/auto4_lua_dialog.cpp
rename to src/auto4_lua_dialog.cpp
diff --git a/aegisub/src/auto4_lua_factory.h b/src/auto4_lua_factory.h
similarity index 100%
rename from aegisub/src/auto4_lua_factory.h
rename to src/auto4_lua_factory.h
diff --git a/aegisub/src/auto4_lua_progresssink.cpp b/src/auto4_lua_progresssink.cpp
similarity index 100%
rename from aegisub/src/auto4_lua_progresssink.cpp
rename to src/auto4_lua_progresssink.cpp
diff --git a/aegisub/src/auto4_lua_scriptreader.cpp b/src/auto4_lua_scriptreader.cpp
similarity index 100%
rename from aegisub/src/auto4_lua_scriptreader.cpp
rename to src/auto4_lua_scriptreader.cpp
diff --git a/aegisub/src/auto4_lua_scriptreader.h b/src/auto4_lua_scriptreader.h
similarity index 100%
rename from aegisub/src/auto4_lua_scriptreader.h
rename to src/auto4_lua_scriptreader.h
diff --git a/aegisub/src/auto4_lua_utils.h b/src/auto4_lua_utils.h
similarity index 100%
rename from aegisub/src/auto4_lua_utils.h
rename to src/auto4_lua_utils.h
diff --git a/aegisub/src/auto4_regex.cpp b/src/auto4_regex.cpp
similarity index 100%
rename from aegisub/src/auto4_regex.cpp
rename to src/auto4_regex.cpp
diff --git a/aegisub/src/avisynth.h b/src/avisynth.h
similarity index 100%
rename from aegisub/src/avisynth.h
rename to src/avisynth.h
diff --git a/aegisub/src/avisynth_wrap.cpp b/src/avisynth_wrap.cpp
similarity index 100%
rename from aegisub/src/avisynth_wrap.cpp
rename to src/avisynth_wrap.cpp
diff --git a/aegisub/src/avisynth_wrap.h b/src/avisynth_wrap.h
similarity index 100%
rename from aegisub/src/avisynth_wrap.h
rename to src/avisynth_wrap.h
diff --git a/aegisub/src/base_grid.cpp b/src/base_grid.cpp
similarity index 100%
rename from aegisub/src/base_grid.cpp
rename to src/base_grid.cpp
diff --git a/aegisub/src/base_grid.h b/src/base_grid.h
similarity index 100%
rename from aegisub/src/base_grid.h
rename to src/base_grid.h
diff --git a/aegisub/src/bitmaps/button/about_menu_16.png b/src/bitmaps/button/about_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/about_menu_16.png
rename to src/bitmaps/button/about_menu_16.png
diff --git a/aegisub/src/bitmaps/button/about_menu_24.png b/src/bitmaps/button/about_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/about_menu_24.png
rename to src/bitmaps/button/about_menu_24.png
diff --git a/aegisub/src/bitmaps/button/about_menu_32.png b/src/bitmaps/button/about_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/about_menu_32.png
rename to src/bitmaps/button/about_menu_32.png
diff --git a/aegisub/src/bitmaps/button/about_menu_48.png b/src/bitmaps/button/about_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/about_menu_48.png
rename to src/bitmaps/button/about_menu_48.png
diff --git a/aegisub/src/bitmaps/button/about_menu_64.png b/src/bitmaps/button/about_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/about_menu_64.png
rename to src/bitmaps/button/about_menu_64.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_16.png b/src/bitmaps/button/arrow_down_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_16.png
rename to src/bitmaps/button/arrow_down_16.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_24.png b/src/bitmaps/button/arrow_down_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_24.png
rename to src/bitmaps/button/arrow_down_24.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_32.png b/src/bitmaps/button/arrow_down_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_32.png
rename to src/bitmaps/button/arrow_down_32.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_48.png b/src/bitmaps/button/arrow_down_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_48.png
rename to src/bitmaps/button/arrow_down_48.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_64.png b/src/bitmaps/button/arrow_down_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_64.png
rename to src/bitmaps/button/arrow_down_64.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_stop_16.png b/src/bitmaps/button/arrow_down_stop_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_stop_16.png
rename to src/bitmaps/button/arrow_down_stop_16.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_stop_24.png b/src/bitmaps/button/arrow_down_stop_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_stop_24.png
rename to src/bitmaps/button/arrow_down_stop_24.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_stop_32.png b/src/bitmaps/button/arrow_down_stop_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_stop_32.png
rename to src/bitmaps/button/arrow_down_stop_32.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_stop_48.png b/src/bitmaps/button/arrow_down_stop_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_stop_48.png
rename to src/bitmaps/button/arrow_down_stop_48.png
diff --git a/aegisub/src/bitmaps/button/arrow_down_stop_64.png b/src/bitmaps/button/arrow_down_stop_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_down_stop_64.png
rename to src/bitmaps/button/arrow_down_stop_64.png
diff --git a/aegisub/src/bitmaps/button/arrow_sort_16.png b/src/bitmaps/button/arrow_sort_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_sort_16.png
rename to src/bitmaps/button/arrow_sort_16.png
diff --git a/aegisub/src/bitmaps/button/arrow_sort_24.png b/src/bitmaps/button/arrow_sort_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_sort_24.png
rename to src/bitmaps/button/arrow_sort_24.png
diff --git a/aegisub/src/bitmaps/button/arrow_sort_32.png b/src/bitmaps/button/arrow_sort_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_sort_32.png
rename to src/bitmaps/button/arrow_sort_32.png
diff --git a/aegisub/src/bitmaps/button/arrow_sort_48.png b/src/bitmaps/button/arrow_sort_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_sort_48.png
rename to src/bitmaps/button/arrow_sort_48.png
diff --git a/aegisub/src/bitmaps/button/arrow_sort_64.png b/src/bitmaps/button/arrow_sort_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_sort_64.png
rename to src/bitmaps/button/arrow_sort_64.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_16.png b/src/bitmaps/button/arrow_up_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_16.png
rename to src/bitmaps/button/arrow_up_16.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_24.png b/src/bitmaps/button/arrow_up_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_24.png
rename to src/bitmaps/button/arrow_up_24.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_32.png b/src/bitmaps/button/arrow_up_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_32.png
rename to src/bitmaps/button/arrow_up_32.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_48.png b/src/bitmaps/button/arrow_up_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_48.png
rename to src/bitmaps/button/arrow_up_48.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_64.png b/src/bitmaps/button/arrow_up_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_64.png
rename to src/bitmaps/button/arrow_up_64.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_stop_16.png b/src/bitmaps/button/arrow_up_stop_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_stop_16.png
rename to src/bitmaps/button/arrow_up_stop_16.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_stop_24.png b/src/bitmaps/button/arrow_up_stop_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_stop_24.png
rename to src/bitmaps/button/arrow_up_stop_24.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_stop_32.png b/src/bitmaps/button/arrow_up_stop_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_stop_32.png
rename to src/bitmaps/button/arrow_up_stop_32.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_stop_48.png b/src/bitmaps/button/arrow_up_stop_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_stop_48.png
rename to src/bitmaps/button/arrow_up_stop_48.png
diff --git a/aegisub/src/bitmaps/button/arrow_up_stop_64.png b/src/bitmaps/button/arrow_up_stop_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/arrow_up_stop_64.png
rename to src/bitmaps/button/arrow_up_stop_64.png
diff --git a/aegisub/src/bitmaps/button/assdraw_16.png b/src/bitmaps/button/assdraw_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/assdraw_16.png
rename to src/bitmaps/button/assdraw_16.png
diff --git a/aegisub/src/bitmaps/button/assdraw_24.png b/src/bitmaps/button/assdraw_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/assdraw_24.png
rename to src/bitmaps/button/assdraw_24.png
diff --git a/aegisub/src/bitmaps/button/assdraw_32.png b/src/bitmaps/button/assdraw_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/assdraw_32.png
rename to src/bitmaps/button/assdraw_32.png
diff --git a/aegisub/src/bitmaps/button/assdraw_48.png b/src/bitmaps/button/assdraw_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/assdraw_48.png
rename to src/bitmaps/button/assdraw_48.png
diff --git a/aegisub/src/bitmaps/button/assdraw_64.png b/src/bitmaps/button/assdraw_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/assdraw_64.png
rename to src/bitmaps/button/assdraw_64.png
diff --git a/aegisub/src/bitmaps/button/attach_button_16.png b/src/bitmaps/button/attach_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/attach_button_16.png
rename to src/bitmaps/button/attach_button_16.png
diff --git a/aegisub/src/bitmaps/button/attach_button_24.png b/src/bitmaps/button/attach_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/attach_button_24.png
rename to src/bitmaps/button/attach_button_24.png
diff --git a/aegisub/src/bitmaps/button/attach_button_32.png b/src/bitmaps/button/attach_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/attach_button_32.png
rename to src/bitmaps/button/attach_button_32.png
diff --git a/aegisub/src/bitmaps/button/attach_button_48.png b/src/bitmaps/button/attach_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/attach_button_48.png
rename to src/bitmaps/button/attach_button_48.png
diff --git a/aegisub/src/bitmaps/button/attach_button_64.png b/src/bitmaps/button/attach_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/attach_button_64.png
rename to src/bitmaps/button/attach_button_64.png
diff --git a/aegisub/src/bitmaps/button/automation_toolbutton_16.png b/src/bitmaps/button/automation_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/automation_toolbutton_16.png
rename to src/bitmaps/button/automation_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/automation_toolbutton_24.png b/src/bitmaps/button/automation_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/automation_toolbutton_24.png
rename to src/bitmaps/button/automation_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/automation_toolbutton_32.png b/src/bitmaps/button/automation_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/automation_toolbutton_32.png
rename to src/bitmaps/button/automation_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/automation_toolbutton_48.png b/src/bitmaps/button/automation_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/automation_toolbutton_48.png
rename to src/bitmaps/button/automation_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/automation_toolbutton_64.png b/src/bitmaps/button/automation_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/automation_toolbutton_64.png
rename to src/bitmaps/button/automation_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/bugtracker_button_16.png b/src/bitmaps/button/bugtracker_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/bugtracker_button_16.png
rename to src/bitmaps/button/bugtracker_button_16.png
diff --git a/aegisub/src/bitmaps/button/bugtracker_button_24.png b/src/bitmaps/button/bugtracker_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/bugtracker_button_24.png
rename to src/bitmaps/button/bugtracker_button_24.png
diff --git a/aegisub/src/bitmaps/button/bugtracker_button_32.png b/src/bitmaps/button/bugtracker_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/bugtracker_button_32.png
rename to src/bitmaps/button/bugtracker_button_32.png
diff --git a/aegisub/src/bitmaps/button/bugtracker_button_48.png b/src/bitmaps/button/bugtracker_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/bugtracker_button_48.png
rename to src/bitmaps/button/bugtracker_button_48.png
diff --git a/aegisub/src/bitmaps/button/bugtracker_button_64.png b/src/bitmaps/button/bugtracker_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/bugtracker_button_64.png
rename to src/bitmaps/button/bugtracker_button_64.png
diff --git a/aegisub/src/bitmaps/button/button_audio_commit_16.png b/src/bitmaps/button/button_audio_commit_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_commit_16.png
rename to src/bitmaps/button/button_audio_commit_16.png
diff --git a/aegisub/src/bitmaps/button/button_audio_commit_24.png b/src/bitmaps/button/button_audio_commit_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_commit_24.png
rename to src/bitmaps/button/button_audio_commit_24.png
diff --git a/aegisub/src/bitmaps/button/button_audio_commit_32.png b/src/bitmaps/button/button_audio_commit_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_commit_32.png
rename to src/bitmaps/button/button_audio_commit_32.png
diff --git a/aegisub/src/bitmaps/button/button_audio_commit_48.png b/src/bitmaps/button/button_audio_commit_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_commit_48.png
rename to src/bitmaps/button/button_audio_commit_48.png
diff --git a/aegisub/src/bitmaps/button/button_audio_commit_64.png b/src/bitmaps/button/button_audio_commit_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_commit_64.png
rename to src/bitmaps/button/button_audio_commit_64.png
diff --git a/aegisub/src/bitmaps/button/button_audio_goto_16.png b/src/bitmaps/button/button_audio_goto_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_goto_16.png
rename to src/bitmaps/button/button_audio_goto_16.png
diff --git a/aegisub/src/bitmaps/button/button_audio_goto_24.png b/src/bitmaps/button/button_audio_goto_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_goto_24.png
rename to src/bitmaps/button/button_audio_goto_24.png
diff --git a/aegisub/src/bitmaps/button/button_audio_goto_32.png b/src/bitmaps/button/button_audio_goto_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_goto_32.png
rename to src/bitmaps/button/button_audio_goto_32.png
diff --git a/aegisub/src/bitmaps/button/button_audio_goto_48.png b/src/bitmaps/button/button_audio_goto_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_goto_48.png
rename to src/bitmaps/button/button_audio_goto_48.png
diff --git a/aegisub/src/bitmaps/button/button_audio_goto_64.png b/src/bitmaps/button/button_audio_goto_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_audio_goto_64.png
rename to src/bitmaps/button/button_audio_goto_64.png
diff --git a/aegisub/src/bitmaps/button/button_bold_16.png b/src/bitmaps/button/button_bold_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_bold_16.png
rename to src/bitmaps/button/button_bold_16.png
diff --git a/aegisub/src/bitmaps/button/button_bold_24.png b/src/bitmaps/button/button_bold_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_bold_24.png
rename to src/bitmaps/button/button_bold_24.png
diff --git a/aegisub/src/bitmaps/button/button_bold_32.png b/src/bitmaps/button/button_bold_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_bold_32.png
rename to src/bitmaps/button/button_bold_32.png
diff --git a/aegisub/src/bitmaps/button/button_bold_48.png b/src/bitmaps/button/button_bold_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_bold_48.png
rename to src/bitmaps/button/button_bold_48.png
diff --git a/aegisub/src/bitmaps/button/button_bold_64.png b/src/bitmaps/button/button_bold_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_bold_64.png
rename to src/bitmaps/button/button_bold_64.png
diff --git a/aegisub/src/bitmaps/button/button_color_four_16.png b/src/bitmaps/button/button_color_four_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_four_16.png
rename to src/bitmaps/button/button_color_four_16.png
diff --git a/aegisub/src/bitmaps/button/button_color_four_24.png b/src/bitmaps/button/button_color_four_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_four_24.png
rename to src/bitmaps/button/button_color_four_24.png
diff --git a/aegisub/src/bitmaps/button/button_color_four_32.png b/src/bitmaps/button/button_color_four_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_four_32.png
rename to src/bitmaps/button/button_color_four_32.png
diff --git a/aegisub/src/bitmaps/button/button_color_four_48.png b/src/bitmaps/button/button_color_four_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_four_48.png
rename to src/bitmaps/button/button_color_four_48.png
diff --git a/aegisub/src/bitmaps/button/button_color_four_64.png b/src/bitmaps/button/button_color_four_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_four_64.png
rename to src/bitmaps/button/button_color_four_64.png
diff --git a/aegisub/src/bitmaps/button/button_color_one_16.png b/src/bitmaps/button/button_color_one_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_one_16.png
rename to src/bitmaps/button/button_color_one_16.png
diff --git a/aegisub/src/bitmaps/button/button_color_one_24.png b/src/bitmaps/button/button_color_one_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_one_24.png
rename to src/bitmaps/button/button_color_one_24.png
diff --git a/aegisub/src/bitmaps/button/button_color_one_32.png b/src/bitmaps/button/button_color_one_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_one_32.png
rename to src/bitmaps/button/button_color_one_32.png
diff --git a/aegisub/src/bitmaps/button/button_color_one_48.png b/src/bitmaps/button/button_color_one_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_one_48.png
rename to src/bitmaps/button/button_color_one_48.png
diff --git a/aegisub/src/bitmaps/button/button_color_one_64.png b/src/bitmaps/button/button_color_one_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_one_64.png
rename to src/bitmaps/button/button_color_one_64.png
diff --git a/aegisub/src/bitmaps/button/button_color_three_16.png b/src/bitmaps/button/button_color_three_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_three_16.png
rename to src/bitmaps/button/button_color_three_16.png
diff --git a/aegisub/src/bitmaps/button/button_color_three_24.png b/src/bitmaps/button/button_color_three_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_three_24.png
rename to src/bitmaps/button/button_color_three_24.png
diff --git a/aegisub/src/bitmaps/button/button_color_three_32.png b/src/bitmaps/button/button_color_three_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_three_32.png
rename to src/bitmaps/button/button_color_three_32.png
diff --git a/aegisub/src/bitmaps/button/button_color_three_48.png b/src/bitmaps/button/button_color_three_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_three_48.png
rename to src/bitmaps/button/button_color_three_48.png
diff --git a/aegisub/src/bitmaps/button/button_color_three_64.png b/src/bitmaps/button/button_color_three_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_three_64.png
rename to src/bitmaps/button/button_color_three_64.png
diff --git a/aegisub/src/bitmaps/button/button_color_two_16.png b/src/bitmaps/button/button_color_two_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_two_16.png
rename to src/bitmaps/button/button_color_two_16.png
diff --git a/aegisub/src/bitmaps/button/button_color_two_24.png b/src/bitmaps/button/button_color_two_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_two_24.png
rename to src/bitmaps/button/button_color_two_24.png
diff --git a/aegisub/src/bitmaps/button/button_color_two_32.png b/src/bitmaps/button/button_color_two_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_two_32.png
rename to src/bitmaps/button/button_color_two_32.png
diff --git a/aegisub/src/bitmaps/button/button_color_two_48.png b/src/bitmaps/button/button_color_two_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_two_48.png
rename to src/bitmaps/button/button_color_two_48.png
diff --git a/aegisub/src/bitmaps/button/button_color_two_64.png b/src/bitmaps/button/button_color_two_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_color_two_64.png
rename to src/bitmaps/button/button_color_two_64.png
diff --git a/aegisub/src/bitmaps/button/button_fontname_16.png b/src/bitmaps/button/button_fontname_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_fontname_16.png
rename to src/bitmaps/button/button_fontname_16.png
diff --git a/aegisub/src/bitmaps/button/button_fontname_24.png b/src/bitmaps/button/button_fontname_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_fontname_24.png
rename to src/bitmaps/button/button_fontname_24.png
diff --git a/aegisub/src/bitmaps/button/button_fontname_32.png b/src/bitmaps/button/button_fontname_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_fontname_32.png
rename to src/bitmaps/button/button_fontname_32.png
diff --git a/aegisub/src/bitmaps/button/button_fontname_48.png b/src/bitmaps/button/button_fontname_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_fontname_48.png
rename to src/bitmaps/button/button_fontname_48.png
diff --git a/aegisub/src/bitmaps/button/button_fontname_64.png b/src/bitmaps/button/button_fontname_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_fontname_64.png
rename to src/bitmaps/button/button_fontname_64.png
diff --git a/aegisub/src/bitmaps/button/button_italics_16.png b/src/bitmaps/button/button_italics_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_italics_16.png
rename to src/bitmaps/button/button_italics_16.png
diff --git a/aegisub/src/bitmaps/button/button_italics_24.png b/src/bitmaps/button/button_italics_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_italics_24.png
rename to src/bitmaps/button/button_italics_24.png
diff --git a/aegisub/src/bitmaps/button/button_italics_32.png b/src/bitmaps/button/button_italics_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_italics_32.png
rename to src/bitmaps/button/button_italics_32.png
diff --git a/aegisub/src/bitmaps/button/button_italics_48.png b/src/bitmaps/button/button_italics_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_italics_48.png
rename to src/bitmaps/button/button_italics_48.png
diff --git a/aegisub/src/bitmaps/button/button_italics_64.png b/src/bitmaps/button/button_italics_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_italics_64.png
rename to src/bitmaps/button/button_italics_64.png
diff --git a/aegisub/src/bitmaps/button/button_leadin_16.png b/src/bitmaps/button/button_leadin_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadin_16.png
rename to src/bitmaps/button/button_leadin_16.png
diff --git a/aegisub/src/bitmaps/button/button_leadin_24.png b/src/bitmaps/button/button_leadin_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadin_24.png
rename to src/bitmaps/button/button_leadin_24.png
diff --git a/aegisub/src/bitmaps/button/button_leadin_32.png b/src/bitmaps/button/button_leadin_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadin_32.png
rename to src/bitmaps/button/button_leadin_32.png
diff --git a/aegisub/src/bitmaps/button/button_leadin_48.png b/src/bitmaps/button/button_leadin_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadin_48.png
rename to src/bitmaps/button/button_leadin_48.png
diff --git a/aegisub/src/bitmaps/button/button_leadin_64.png b/src/bitmaps/button/button_leadin_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadin_64.png
rename to src/bitmaps/button/button_leadin_64.png
diff --git a/aegisub/src/bitmaps/button/button_leadout_16.png b/src/bitmaps/button/button_leadout_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadout_16.png
rename to src/bitmaps/button/button_leadout_16.png
diff --git a/aegisub/src/bitmaps/button/button_leadout_24.png b/src/bitmaps/button/button_leadout_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadout_24.png
rename to src/bitmaps/button/button_leadout_24.png
diff --git a/aegisub/src/bitmaps/button/button_leadout_32.png b/src/bitmaps/button/button_leadout_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadout_32.png
rename to src/bitmaps/button/button_leadout_32.png
diff --git a/aegisub/src/bitmaps/button/button_leadout_48.png b/src/bitmaps/button/button_leadout_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadout_48.png
rename to src/bitmaps/button/button_leadout_48.png
diff --git a/aegisub/src/bitmaps/button/button_leadout_64.png b/src/bitmaps/button/button_leadout_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_leadout_64.png
rename to src/bitmaps/button/button_leadout_64.png
diff --git a/aegisub/src/bitmaps/button/button_next_16.png b/src/bitmaps/button/button_next_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_next_16.png
rename to src/bitmaps/button/button_next_16.png
diff --git a/aegisub/src/bitmaps/button/button_next_24.png b/src/bitmaps/button/button_next_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_next_24.png
rename to src/bitmaps/button/button_next_24.png
diff --git a/aegisub/src/bitmaps/button/button_next_32.png b/src/bitmaps/button/button_next_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_next_32.png
rename to src/bitmaps/button/button_next_32.png
diff --git a/aegisub/src/bitmaps/button/button_next_48.png b/src/bitmaps/button/button_next_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_next_48.png
rename to src/bitmaps/button/button_next_48.png
diff --git a/aegisub/src/bitmaps/button/button_next_64.png b/src/bitmaps/button/button_next_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_next_64.png
rename to src/bitmaps/button/button_next_64.png
diff --git a/aegisub/src/bitmaps/button/button_pause_16.png b/src/bitmaps/button/button_pause_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_pause_16.png
rename to src/bitmaps/button/button_pause_16.png
diff --git a/aegisub/src/bitmaps/button/button_pause_24.png b/src/bitmaps/button/button_pause_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_pause_24.png
rename to src/bitmaps/button/button_pause_24.png
diff --git a/aegisub/src/bitmaps/button/button_pause_32.png b/src/bitmaps/button/button_pause_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_pause_32.png
rename to src/bitmaps/button/button_pause_32.png
diff --git a/aegisub/src/bitmaps/button/button_pause_48.png b/src/bitmaps/button/button_pause_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_pause_48.png
rename to src/bitmaps/button/button_pause_48.png
diff --git a/aegisub/src/bitmaps/button/button_pause_64.png b/src/bitmaps/button/button_pause_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_pause_64.png
rename to src/bitmaps/button/button_pause_64.png
diff --git a/aegisub/src/bitmaps/button/button_play_16.png b/src/bitmaps/button/button_play_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_play_16.png
rename to src/bitmaps/button/button_play_16.png
diff --git a/aegisub/src/bitmaps/button/button_play_24.png b/src/bitmaps/button/button_play_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_play_24.png
rename to src/bitmaps/button/button_play_24.png
diff --git a/aegisub/src/bitmaps/button/button_play_32.png b/src/bitmaps/button/button_play_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_play_32.png
rename to src/bitmaps/button/button_play_32.png
diff --git a/aegisub/src/bitmaps/button/button_play_48.png b/src/bitmaps/button/button_play_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_play_48.png
rename to src/bitmaps/button/button_play_48.png
diff --git a/aegisub/src/bitmaps/button/button_play_64.png b/src/bitmaps/button/button_play_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_play_64.png
rename to src/bitmaps/button/button_play_64.png
diff --git a/aegisub/src/bitmaps/button/button_playfirstfiveh_16.png b/src/bitmaps/button/button_playfirstfiveh_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfirstfiveh_16.png
rename to src/bitmaps/button/button_playfirstfiveh_16.png
diff --git a/aegisub/src/bitmaps/button/button_playfirstfiveh_24.png b/src/bitmaps/button/button_playfirstfiveh_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfirstfiveh_24.png
rename to src/bitmaps/button/button_playfirstfiveh_24.png
diff --git a/aegisub/src/bitmaps/button/button_playfirstfiveh_32.png b/src/bitmaps/button/button_playfirstfiveh_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfirstfiveh_32.png
rename to src/bitmaps/button/button_playfirstfiveh_32.png
diff --git a/aegisub/src/bitmaps/button/button_playfirstfiveh_48.png b/src/bitmaps/button/button_playfirstfiveh_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfirstfiveh_48.png
rename to src/bitmaps/button/button_playfirstfiveh_48.png
diff --git a/aegisub/src/bitmaps/button/button_playfirstfiveh_64.png b/src/bitmaps/button/button_playfirstfiveh_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfirstfiveh_64.png
rename to src/bitmaps/button/button_playfirstfiveh_64.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehafter_16.png b/src/bitmaps/button/button_playfivehafter_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehafter_16.png
rename to src/bitmaps/button/button_playfivehafter_16.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehafter_24.png b/src/bitmaps/button/button_playfivehafter_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehafter_24.png
rename to src/bitmaps/button/button_playfivehafter_24.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehafter_32.png b/src/bitmaps/button/button_playfivehafter_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehafter_32.png
rename to src/bitmaps/button/button_playfivehafter_32.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehafter_48.png b/src/bitmaps/button/button_playfivehafter_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehafter_48.png
rename to src/bitmaps/button/button_playfivehafter_48.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehafter_64.png b/src/bitmaps/button/button_playfivehafter_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehafter_64.png
rename to src/bitmaps/button/button_playfivehafter_64.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehbefore_16.png b/src/bitmaps/button/button_playfivehbefore_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehbefore_16.png
rename to src/bitmaps/button/button_playfivehbefore_16.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehbefore_24.png b/src/bitmaps/button/button_playfivehbefore_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehbefore_24.png
rename to src/bitmaps/button/button_playfivehbefore_24.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehbefore_32.png b/src/bitmaps/button/button_playfivehbefore_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehbefore_32.png
rename to src/bitmaps/button/button_playfivehbefore_32.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehbefore_48.png b/src/bitmaps/button/button_playfivehbefore_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehbefore_48.png
rename to src/bitmaps/button/button_playfivehbefore_48.png
diff --git a/aegisub/src/bitmaps/button/button_playfivehbefore_64.png b/src/bitmaps/button/button_playfivehbefore_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playfivehbefore_64.png
rename to src/bitmaps/button/button_playfivehbefore_64.png
diff --git a/aegisub/src/bitmaps/button/button_playlastfiveh_16.png b/src/bitmaps/button/button_playlastfiveh_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playlastfiveh_16.png
rename to src/bitmaps/button/button_playlastfiveh_16.png
diff --git a/aegisub/src/bitmaps/button/button_playlastfiveh_24.png b/src/bitmaps/button/button_playlastfiveh_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playlastfiveh_24.png
rename to src/bitmaps/button/button_playlastfiveh_24.png
diff --git a/aegisub/src/bitmaps/button/button_playlastfiveh_32.png b/src/bitmaps/button/button_playlastfiveh_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playlastfiveh_32.png
rename to src/bitmaps/button/button_playlastfiveh_32.png
diff --git a/aegisub/src/bitmaps/button/button_playlastfiveh_48.png b/src/bitmaps/button/button_playlastfiveh_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playlastfiveh_48.png
rename to src/bitmaps/button/button_playlastfiveh_48.png
diff --git a/aegisub/src/bitmaps/button/button_playlastfiveh_64.png b/src/bitmaps/button/button_playlastfiveh_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playlastfiveh_64.png
rename to src/bitmaps/button/button_playlastfiveh_64.png
diff --git a/aegisub/src/bitmaps/button/button_playline_16.png b/src/bitmaps/button/button_playline_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playline_16.png
rename to src/bitmaps/button/button_playline_16.png
diff --git a/aegisub/src/bitmaps/button/button_playline_24.png b/src/bitmaps/button/button_playline_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playline_24.png
rename to src/bitmaps/button/button_playline_24.png
diff --git a/aegisub/src/bitmaps/button/button_playline_32.png b/src/bitmaps/button/button_playline_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playline_32.png
rename to src/bitmaps/button/button_playline_32.png
diff --git a/aegisub/src/bitmaps/button/button_playline_48.png b/src/bitmaps/button/button_playline_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playline_48.png
rename to src/bitmaps/button/button_playline_48.png
diff --git a/aegisub/src/bitmaps/button/button_playline_64.png b/src/bitmaps/button/button_playline_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playline_64.png
rename to src/bitmaps/button/button_playline_64.png
diff --git a/aegisub/src/bitmaps/button/button_playsel_16.png b/src/bitmaps/button/button_playsel_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playsel_16.png
rename to src/bitmaps/button/button_playsel_16.png
diff --git a/aegisub/src/bitmaps/button/button_playsel_24.png b/src/bitmaps/button/button_playsel_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playsel_24.png
rename to src/bitmaps/button/button_playsel_24.png
diff --git a/aegisub/src/bitmaps/button/button_playsel_32.png b/src/bitmaps/button/button_playsel_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playsel_32.png
rename to src/bitmaps/button/button_playsel_32.png
diff --git a/aegisub/src/bitmaps/button/button_playsel_48.png b/src/bitmaps/button/button_playsel_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playsel_48.png
rename to src/bitmaps/button/button_playsel_48.png
diff --git a/aegisub/src/bitmaps/button/button_playsel_64.png b/src/bitmaps/button/button_playsel_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playsel_64.png
rename to src/bitmaps/button/button_playsel_64.png
diff --git a/aegisub/src/bitmaps/button/button_playtoend_16.png b/src/bitmaps/button/button_playtoend_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playtoend_16.png
rename to src/bitmaps/button/button_playtoend_16.png
diff --git a/aegisub/src/bitmaps/button/button_playtoend_24.png b/src/bitmaps/button/button_playtoend_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playtoend_24.png
rename to src/bitmaps/button/button_playtoend_24.png
diff --git a/aegisub/src/bitmaps/button/button_playtoend_32.png b/src/bitmaps/button/button_playtoend_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playtoend_32.png
rename to src/bitmaps/button/button_playtoend_32.png
diff --git a/aegisub/src/bitmaps/button/button_playtoend_48.png b/src/bitmaps/button/button_playtoend_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playtoend_48.png
rename to src/bitmaps/button/button_playtoend_48.png
diff --git a/aegisub/src/bitmaps/button/button_playtoend_64.png b/src/bitmaps/button/button_playtoend_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_playtoend_64.png
rename to src/bitmaps/button/button_playtoend_64.png
diff --git a/aegisub/src/bitmaps/button/button_prev_16.png b/src/bitmaps/button/button_prev_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_prev_16.png
rename to src/bitmaps/button/button_prev_16.png
diff --git a/aegisub/src/bitmaps/button/button_prev_24.png b/src/bitmaps/button/button_prev_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_prev_24.png
rename to src/bitmaps/button/button_prev_24.png
diff --git a/aegisub/src/bitmaps/button/button_prev_32.png b/src/bitmaps/button/button_prev_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_prev_32.png
rename to src/bitmaps/button/button_prev_32.png
diff --git a/aegisub/src/bitmaps/button/button_prev_48.png b/src/bitmaps/button/button_prev_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_prev_48.png
rename to src/bitmaps/button/button_prev_48.png
diff --git a/aegisub/src/bitmaps/button/button_prev_64.png b/src/bitmaps/button/button_prev_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_prev_64.png
rename to src/bitmaps/button/button_prev_64.png
diff --git a/aegisub/src/bitmaps/button/button_stop_16.png b/src/bitmaps/button/button_stop_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_stop_16.png
rename to src/bitmaps/button/button_stop_16.png
diff --git a/aegisub/src/bitmaps/button/button_stop_24.png b/src/bitmaps/button/button_stop_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_stop_24.png
rename to src/bitmaps/button/button_stop_24.png
diff --git a/aegisub/src/bitmaps/button/button_stop_32.png b/src/bitmaps/button/button_stop_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_stop_32.png
rename to src/bitmaps/button/button_stop_32.png
diff --git a/aegisub/src/bitmaps/button/button_stop_48.png b/src/bitmaps/button/button_stop_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_stop_48.png
rename to src/bitmaps/button/button_stop_48.png
diff --git a/aegisub/src/bitmaps/button/button_stop_64.png b/src/bitmaps/button/button_stop_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_stop_64.png
rename to src/bitmaps/button/button_stop_64.png
diff --git a/aegisub/src/bitmaps/button/button_strikeout_16.png b/src/bitmaps/button/button_strikeout_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_strikeout_16.png
rename to src/bitmaps/button/button_strikeout_16.png
diff --git a/aegisub/src/bitmaps/button/button_strikeout_24.png b/src/bitmaps/button/button_strikeout_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_strikeout_24.png
rename to src/bitmaps/button/button_strikeout_24.png
diff --git a/aegisub/src/bitmaps/button/button_strikeout_32.png b/src/bitmaps/button/button_strikeout_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_strikeout_32.png
rename to src/bitmaps/button/button_strikeout_32.png
diff --git a/aegisub/src/bitmaps/button/button_strikeout_48.png b/src/bitmaps/button/button_strikeout_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_strikeout_48.png
rename to src/bitmaps/button/button_strikeout_48.png
diff --git a/aegisub/src/bitmaps/button/button_strikeout_64.png b/src/bitmaps/button/button_strikeout_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_strikeout_64.png
rename to src/bitmaps/button/button_strikeout_64.png
diff --git a/aegisub/src/bitmaps/button/button_underline_16.png b/src/bitmaps/button/button_underline_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_underline_16.png
rename to src/bitmaps/button/button_underline_16.png
diff --git a/aegisub/src/bitmaps/button/button_underline_24.png b/src/bitmaps/button/button_underline_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_underline_24.png
rename to src/bitmaps/button/button_underline_24.png
diff --git a/aegisub/src/bitmaps/button/button_underline_32.png b/src/bitmaps/button/button_underline_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_underline_32.png
rename to src/bitmaps/button/button_underline_32.png
diff --git a/aegisub/src/bitmaps/button/button_underline_48.png b/src/bitmaps/button/button_underline_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_underline_48.png
rename to src/bitmaps/button/button_underline_48.png
diff --git a/aegisub/src/bitmaps/button/button_underline_64.png b/src/bitmaps/button/button_underline_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/button_underline_64.png
rename to src/bitmaps/button/button_underline_64.png
diff --git a/aegisub/src/bitmaps/button/close_audio_menu_16.png b/src/bitmaps/button/close_audio_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_audio_menu_16.png
rename to src/bitmaps/button/close_audio_menu_16.png
diff --git a/aegisub/src/bitmaps/button/close_audio_menu_24.png b/src/bitmaps/button/close_audio_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_audio_menu_24.png
rename to src/bitmaps/button/close_audio_menu_24.png
diff --git a/aegisub/src/bitmaps/button/close_audio_menu_32.png b/src/bitmaps/button/close_audio_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_audio_menu_32.png
rename to src/bitmaps/button/close_audio_menu_32.png
diff --git a/aegisub/src/bitmaps/button/close_audio_menu_48.png b/src/bitmaps/button/close_audio_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_audio_menu_48.png
rename to src/bitmaps/button/close_audio_menu_48.png
diff --git a/aegisub/src/bitmaps/button/close_audio_menu_64.png b/src/bitmaps/button/close_audio_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_audio_menu_64.png
rename to src/bitmaps/button/close_audio_menu_64.png
diff --git a/aegisub/src/bitmaps/button/close_keyframes_menu_16.png b/src/bitmaps/button/close_keyframes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_keyframes_menu_16.png
rename to src/bitmaps/button/close_keyframes_menu_16.png
diff --git a/aegisub/src/bitmaps/button/close_keyframes_menu_24.png b/src/bitmaps/button/close_keyframes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_keyframes_menu_24.png
rename to src/bitmaps/button/close_keyframes_menu_24.png
diff --git a/aegisub/src/bitmaps/button/close_keyframes_menu_32.png b/src/bitmaps/button/close_keyframes_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_keyframes_menu_32.png
rename to src/bitmaps/button/close_keyframes_menu_32.png
diff --git a/aegisub/src/bitmaps/button/close_keyframes_menu_48.png b/src/bitmaps/button/close_keyframes_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_keyframes_menu_48.png
rename to src/bitmaps/button/close_keyframes_menu_48.png
diff --git a/aegisub/src/bitmaps/button/close_keyframes_menu_64.png b/src/bitmaps/button/close_keyframes_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_keyframes_menu_64.png
rename to src/bitmaps/button/close_keyframes_menu_64.png
diff --git a/aegisub/src/bitmaps/button/close_timecodes_menu_16.png b/src/bitmaps/button/close_timecodes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_timecodes_menu_16.png
rename to src/bitmaps/button/close_timecodes_menu_16.png
diff --git a/aegisub/src/bitmaps/button/close_timecodes_menu_24.png b/src/bitmaps/button/close_timecodes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_timecodes_menu_24.png
rename to src/bitmaps/button/close_timecodes_menu_24.png
diff --git a/aegisub/src/bitmaps/button/close_timecodes_menu_32.png b/src/bitmaps/button/close_timecodes_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_timecodes_menu_32.png
rename to src/bitmaps/button/close_timecodes_menu_32.png
diff --git a/aegisub/src/bitmaps/button/close_timecodes_menu_48.png b/src/bitmaps/button/close_timecodes_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_timecodes_menu_48.png
rename to src/bitmaps/button/close_timecodes_menu_48.png
diff --git a/aegisub/src/bitmaps/button/close_timecodes_menu_64.png b/src/bitmaps/button/close_timecodes_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_timecodes_menu_64.png
rename to src/bitmaps/button/close_timecodes_menu_64.png
diff --git a/aegisub/src/bitmaps/button/close_video_menu_16.png b/src/bitmaps/button/close_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_video_menu_16.png
rename to src/bitmaps/button/close_video_menu_16.png
diff --git a/aegisub/src/bitmaps/button/close_video_menu_24.png b/src/bitmaps/button/close_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_video_menu_24.png
rename to src/bitmaps/button/close_video_menu_24.png
diff --git a/aegisub/src/bitmaps/button/close_video_menu_32.png b/src/bitmaps/button/close_video_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_video_menu_32.png
rename to src/bitmaps/button/close_video_menu_32.png
diff --git a/aegisub/src/bitmaps/button/close_video_menu_48.png b/src/bitmaps/button/close_video_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_video_menu_48.png
rename to src/bitmaps/button/close_video_menu_48.png
diff --git a/aegisub/src/bitmaps/button/close_video_menu_64.png b/src/bitmaps/button/close_video_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/close_video_menu_64.png
rename to src/bitmaps/button/close_video_menu_64.png
diff --git a/aegisub/src/bitmaps/button/contents_button_16.png b/src/bitmaps/button/contents_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/contents_button_16.png
rename to src/bitmaps/button/contents_button_16.png
diff --git a/aegisub/src/bitmaps/button/contents_button_24.png b/src/bitmaps/button/contents_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/contents_button_24.png
rename to src/bitmaps/button/contents_button_24.png
diff --git a/aegisub/src/bitmaps/button/contents_button_32.png b/src/bitmaps/button/contents_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/contents_button_32.png
rename to src/bitmaps/button/contents_button_32.png
diff --git a/aegisub/src/bitmaps/button/contents_button_48.png b/src/bitmaps/button/contents_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/contents_button_48.png
rename to src/bitmaps/button/contents_button_48.png
diff --git a/aegisub/src/bitmaps/button/contents_button_64.png b/src/bitmaps/button/contents_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/contents_button_64.png
rename to src/bitmaps/button/contents_button_64.png
diff --git a/aegisub/src/bitmaps/button/copy_button_16.png b/src/bitmaps/button/copy_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/copy_button_16.png
rename to src/bitmaps/button/copy_button_16.png
diff --git a/aegisub/src/bitmaps/button/copy_button_24.png b/src/bitmaps/button/copy_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/copy_button_24.png
rename to src/bitmaps/button/copy_button_24.png
diff --git a/aegisub/src/bitmaps/button/copy_button_32.png b/src/bitmaps/button/copy_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/copy_button_32.png
rename to src/bitmaps/button/copy_button_32.png
diff --git a/aegisub/src/bitmaps/button/copy_button_48.png b/src/bitmaps/button/copy_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/copy_button_48.png
rename to src/bitmaps/button/copy_button_48.png
diff --git a/aegisub/src/bitmaps/button/copy_button_64.png b/src/bitmaps/button/copy_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/copy_button_64.png
rename to src/bitmaps/button/copy_button_64.png
diff --git a/aegisub/src/bitmaps/button/cut_button_16.png b/src/bitmaps/button/cut_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/cut_button_16.png
rename to src/bitmaps/button/cut_button_16.png
diff --git a/aegisub/src/bitmaps/button/cut_button_24.png b/src/bitmaps/button/cut_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/cut_button_24.png
rename to src/bitmaps/button/cut_button_24.png
diff --git a/aegisub/src/bitmaps/button/cut_button_32.png b/src/bitmaps/button/cut_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/cut_button_32.png
rename to src/bitmaps/button/cut_button_32.png
diff --git a/aegisub/src/bitmaps/button/cut_button_48.png b/src/bitmaps/button/cut_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/cut_button_48.png
rename to src/bitmaps/button/cut_button_48.png
diff --git a/aegisub/src/bitmaps/button/cut_button_64.png b/src/bitmaps/button/cut_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/cut_button_64.png
rename to src/bitmaps/button/cut_button_64.png
diff --git a/aegisub/src/bitmaps/button/delete_button_16.png b/src/bitmaps/button/delete_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/delete_button_16.png
rename to src/bitmaps/button/delete_button_16.png
diff --git a/aegisub/src/bitmaps/button/delete_button_24.png b/src/bitmaps/button/delete_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/delete_button_24.png
rename to src/bitmaps/button/delete_button_24.png
diff --git a/aegisub/src/bitmaps/button/delete_button_32.png b/src/bitmaps/button/delete_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/delete_button_32.png
rename to src/bitmaps/button/delete_button_32.png
diff --git a/aegisub/src/bitmaps/button/delete_button_48.png b/src/bitmaps/button/delete_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/delete_button_48.png
rename to src/bitmaps/button/delete_button_48.png
diff --git a/aegisub/src/bitmaps/button/delete_button_64.png b/src/bitmaps/button/delete_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/delete_button_64.png
rename to src/bitmaps/button/delete_button_64.png
diff --git a/aegisub/src/bitmaps/button/detach_video_menu_16.png b/src/bitmaps/button/detach_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/detach_video_menu_16.png
rename to src/bitmaps/button/detach_video_menu_16.png
diff --git a/aegisub/src/bitmaps/button/detach_video_menu_24.png b/src/bitmaps/button/detach_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/detach_video_menu_24.png
rename to src/bitmaps/button/detach_video_menu_24.png
diff --git a/aegisub/src/bitmaps/button/detach_video_menu_32.png b/src/bitmaps/button/detach_video_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/detach_video_menu_32.png
rename to src/bitmaps/button/detach_video_menu_32.png
diff --git a/aegisub/src/bitmaps/button/detach_video_menu_48.png b/src/bitmaps/button/detach_video_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/detach_video_menu_48.png
rename to src/bitmaps/button/detach_video_menu_48.png
diff --git a/aegisub/src/bitmaps/button/detach_video_menu_64.png b/src/bitmaps/button/detach_video_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/detach_video_menu_64.png
rename to src/bitmaps/button/detach_video_menu_64.png
diff --git a/aegisub/src/bitmaps/button/export_menu_16.png b/src/bitmaps/button/export_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/export_menu_16.png
rename to src/bitmaps/button/export_menu_16.png
diff --git a/aegisub/src/bitmaps/button/export_menu_24.png b/src/bitmaps/button/export_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/export_menu_24.png
rename to src/bitmaps/button/export_menu_24.png
diff --git a/aegisub/src/bitmaps/button/export_menu_32.png b/src/bitmaps/button/export_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/export_menu_32.png
rename to src/bitmaps/button/export_menu_32.png
diff --git a/aegisub/src/bitmaps/button/export_menu_48.png b/src/bitmaps/button/export_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/export_menu_48.png
rename to src/bitmaps/button/export_menu_48.png
diff --git a/aegisub/src/bitmaps/button/export_menu_64.png b/src/bitmaps/button/export_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/export_menu_64.png
rename to src/bitmaps/button/export_menu_64.png
diff --git a/aegisub/src/bitmaps/button/eyedropper_tool_16.png b/src/bitmaps/button/eyedropper_tool_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/eyedropper_tool_16.png
rename to src/bitmaps/button/eyedropper_tool_16.png
diff --git a/aegisub/src/bitmaps/button/eyedropper_tool_24.png b/src/bitmaps/button/eyedropper_tool_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/eyedropper_tool_24.png
rename to src/bitmaps/button/eyedropper_tool_24.png
diff --git a/aegisub/src/bitmaps/button/eyedropper_tool_32.png b/src/bitmaps/button/eyedropper_tool_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/eyedropper_tool_32.png
rename to src/bitmaps/button/eyedropper_tool_32.png
diff --git a/aegisub/src/bitmaps/button/eyedropper_tool_48.png b/src/bitmaps/button/eyedropper_tool_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/eyedropper_tool_48.png
rename to src/bitmaps/button/eyedropper_tool_48.png
diff --git a/aegisub/src/bitmaps/button/eyedropper_tool_64.png b/src/bitmaps/button/eyedropper_tool_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/eyedropper_tool_64.png
rename to src/bitmaps/button/eyedropper_tool_64.png
diff --git a/aegisub/src/bitmaps/button/find_button_16.png b/src/bitmaps/button/find_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_button_16.png
rename to src/bitmaps/button/find_button_16.png
diff --git a/aegisub/src/bitmaps/button/find_button_24.png b/src/bitmaps/button/find_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_button_24.png
rename to src/bitmaps/button/find_button_24.png
diff --git a/aegisub/src/bitmaps/button/find_button_32.png b/src/bitmaps/button/find_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_button_32.png
rename to src/bitmaps/button/find_button_32.png
diff --git a/aegisub/src/bitmaps/button/find_button_48.png b/src/bitmaps/button/find_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_button_48.png
rename to src/bitmaps/button/find_button_48.png
diff --git a/aegisub/src/bitmaps/button/find_button_64.png b/src/bitmaps/button/find_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_button_64.png
rename to src/bitmaps/button/find_button_64.png
diff --git a/aegisub/src/bitmaps/button/find_next_menu_16.png b/src/bitmaps/button/find_next_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_next_menu_16.png
rename to src/bitmaps/button/find_next_menu_16.png
diff --git a/aegisub/src/bitmaps/button/find_next_menu_24.png b/src/bitmaps/button/find_next_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_next_menu_24.png
rename to src/bitmaps/button/find_next_menu_24.png
diff --git a/aegisub/src/bitmaps/button/find_next_menu_32.png b/src/bitmaps/button/find_next_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_next_menu_32.png
rename to src/bitmaps/button/find_next_menu_32.png
diff --git a/aegisub/src/bitmaps/button/find_next_menu_48.png b/src/bitmaps/button/find_next_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_next_menu_48.png
rename to src/bitmaps/button/find_next_menu_48.png
diff --git a/aegisub/src/bitmaps/button/find_next_menu_64.png b/src/bitmaps/button/find_next_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_next_menu_64.png
rename to src/bitmaps/button/find_next_menu_64.png
diff --git a/aegisub/src/bitmaps/button/find_replace_menu_16.png b/src/bitmaps/button/find_replace_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_replace_menu_16.png
rename to src/bitmaps/button/find_replace_menu_16.png
diff --git a/aegisub/src/bitmaps/button/find_replace_menu_24.png b/src/bitmaps/button/find_replace_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_replace_menu_24.png
rename to src/bitmaps/button/find_replace_menu_24.png
diff --git a/aegisub/src/bitmaps/button/find_replace_menu_32.png b/src/bitmaps/button/find_replace_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_replace_menu_32.png
rename to src/bitmaps/button/find_replace_menu_32.png
diff --git a/aegisub/src/bitmaps/button/find_replace_menu_48.png b/src/bitmaps/button/find_replace_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_replace_menu_48.png
rename to src/bitmaps/button/find_replace_menu_48.png
diff --git a/aegisub/src/bitmaps/button/find_replace_menu_64.png b/src/bitmaps/button/find_replace_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/find_replace_menu_64.png
rename to src/bitmaps/button/find_replace_menu_64.png
diff --git a/aegisub/src/bitmaps/button/font_collector_button_16.png b/src/bitmaps/button/font_collector_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/font_collector_button_16.png
rename to src/bitmaps/button/font_collector_button_16.png
diff --git a/aegisub/src/bitmaps/button/font_collector_button_24.png b/src/bitmaps/button/font_collector_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/font_collector_button_24.png
rename to src/bitmaps/button/font_collector_button_24.png
diff --git a/aegisub/src/bitmaps/button/font_collector_button_32.png b/src/bitmaps/button/font_collector_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/font_collector_button_32.png
rename to src/bitmaps/button/font_collector_button_32.png
diff --git a/aegisub/src/bitmaps/button/font_collector_button_48.png b/src/bitmaps/button/font_collector_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/font_collector_button_48.png
rename to src/bitmaps/button/font_collector_button_48.png
diff --git a/aegisub/src/bitmaps/button/font_collector_button_64.png b/src/bitmaps/button/font_collector_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/font_collector_button_64.png
rename to src/bitmaps/button/font_collector_button_64.png
diff --git a/aegisub/src/bitmaps/button/forums_button_16.png b/src/bitmaps/button/forums_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/forums_button_16.png
rename to src/bitmaps/button/forums_button_16.png
diff --git a/aegisub/src/bitmaps/button/forums_button_24.png b/src/bitmaps/button/forums_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/forums_button_24.png
rename to src/bitmaps/button/forums_button_24.png
diff --git a/aegisub/src/bitmaps/button/forums_button_32.png b/src/bitmaps/button/forums_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/forums_button_32.png
rename to src/bitmaps/button/forums_button_32.png
diff --git a/aegisub/src/bitmaps/button/forums_button_48.png b/src/bitmaps/button/forums_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/forums_button_48.png
rename to src/bitmaps/button/forums_button_48.png
diff --git a/aegisub/src/bitmaps/button/forums_button_64.png b/src/bitmaps/button/forums_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/forums_button_64.png
rename to src/bitmaps/button/forums_button_64.png
diff --git a/aegisub/src/bitmaps/button/irc_button_16.png b/src/bitmaps/button/irc_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/irc_button_16.png
rename to src/bitmaps/button/irc_button_16.png
diff --git a/aegisub/src/bitmaps/button/irc_button_24.png b/src/bitmaps/button/irc_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/irc_button_24.png
rename to src/bitmaps/button/irc_button_24.png
diff --git a/aegisub/src/bitmaps/button/irc_button_32.png b/src/bitmaps/button/irc_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/irc_button_32.png
rename to src/bitmaps/button/irc_button_32.png
diff --git a/aegisub/src/bitmaps/button/irc_button_48.png b/src/bitmaps/button/irc_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/irc_button_48.png
rename to src/bitmaps/button/irc_button_48.png
diff --git a/aegisub/src/bitmaps/button/irc_button_64.png b/src/bitmaps/button/irc_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/irc_button_64.png
rename to src/bitmaps/button/irc_button_64.png
diff --git a/aegisub/src/bitmaps/button/jumpto_button_16.png b/src/bitmaps/button/jumpto_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/jumpto_button_16.png
rename to src/bitmaps/button/jumpto_button_16.png
diff --git a/aegisub/src/bitmaps/button/jumpto_button_24.png b/src/bitmaps/button/jumpto_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/jumpto_button_24.png
rename to src/bitmaps/button/jumpto_button_24.png
diff --git a/aegisub/src/bitmaps/button/jumpto_button_32.png b/src/bitmaps/button/jumpto_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/jumpto_button_32.png
rename to src/bitmaps/button/jumpto_button_32.png
diff --git a/aegisub/src/bitmaps/button/jumpto_button_48.png b/src/bitmaps/button/jumpto_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/jumpto_button_48.png
rename to src/bitmaps/button/jumpto_button_48.png
diff --git a/aegisub/src/bitmaps/button/jumpto_button_64.png b/src/bitmaps/button/jumpto_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/jumpto_button_64.png
rename to src/bitmaps/button/jumpto_button_64.png
diff --git a/aegisub/src/bitmaps/button/kara_mode_16.png b/src/bitmaps/button/kara_mode_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_mode_16.png
rename to src/bitmaps/button/kara_mode_16.png
diff --git a/aegisub/src/bitmaps/button/kara_mode_24.png b/src/bitmaps/button/kara_mode_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_mode_24.png
rename to src/bitmaps/button/kara_mode_24.png
diff --git a/aegisub/src/bitmaps/button/kara_mode_32.png b/src/bitmaps/button/kara_mode_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_mode_32.png
rename to src/bitmaps/button/kara_mode_32.png
diff --git a/aegisub/src/bitmaps/button/kara_mode_48.png b/src/bitmaps/button/kara_mode_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_mode_48.png
rename to src/bitmaps/button/kara_mode_48.png
diff --git a/aegisub/src/bitmaps/button/kara_mode_64.png b/src/bitmaps/button/kara_mode_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_mode_64.png
rename to src/bitmaps/button/kara_mode_64.png
diff --git a/aegisub/src/bitmaps/button/kara_split_16.png b/src/bitmaps/button/kara_split_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_16.png
rename to src/bitmaps/button/kara_split_16.png
diff --git a/aegisub/src/bitmaps/button/kara_split_24.png b/src/bitmaps/button/kara_split_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_24.png
rename to src/bitmaps/button/kara_split_24.png
diff --git a/aegisub/src/bitmaps/button/kara_split_32.png b/src/bitmaps/button/kara_split_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_32.png
rename to src/bitmaps/button/kara_split_32.png
diff --git a/aegisub/src/bitmaps/button/kara_split_48.png b/src/bitmaps/button/kara_split_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_48.png
rename to src/bitmaps/button/kara_split_48.png
diff --git a/aegisub/src/bitmaps/button/kara_split_64.png b/src/bitmaps/button/kara_split_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_64.png
rename to src/bitmaps/button/kara_split_64.png
diff --git a/aegisub/src/bitmaps/button/kara_split_accept_16.png b/src/bitmaps/button/kara_split_accept_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_accept_16.png
rename to src/bitmaps/button/kara_split_accept_16.png
diff --git a/aegisub/src/bitmaps/button/kara_split_accept_24.png b/src/bitmaps/button/kara_split_accept_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_accept_24.png
rename to src/bitmaps/button/kara_split_accept_24.png
diff --git a/aegisub/src/bitmaps/button/kara_split_accept_32.png b/src/bitmaps/button/kara_split_accept_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_accept_32.png
rename to src/bitmaps/button/kara_split_accept_32.png
diff --git a/aegisub/src/bitmaps/button/kara_split_accept_48.png b/src/bitmaps/button/kara_split_accept_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_accept_48.png
rename to src/bitmaps/button/kara_split_accept_48.png
diff --git a/aegisub/src/bitmaps/button/kara_split_accept_64.png b/src/bitmaps/button/kara_split_accept_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_accept_64.png
rename to src/bitmaps/button/kara_split_accept_64.png
diff --git a/aegisub/src/bitmaps/button/kara_split_cancel_16.png b/src/bitmaps/button/kara_split_cancel_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_cancel_16.png
rename to src/bitmaps/button/kara_split_cancel_16.png
diff --git a/aegisub/src/bitmaps/button/kara_split_cancel_24.png b/src/bitmaps/button/kara_split_cancel_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_cancel_24.png
rename to src/bitmaps/button/kara_split_cancel_24.png
diff --git a/aegisub/src/bitmaps/button/kara_split_cancel_32.png b/src/bitmaps/button/kara_split_cancel_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_cancel_32.png
rename to src/bitmaps/button/kara_split_cancel_32.png
diff --git a/aegisub/src/bitmaps/button/kara_split_cancel_48.png b/src/bitmaps/button/kara_split_cancel_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_cancel_48.png
rename to src/bitmaps/button/kara_split_cancel_48.png
diff --git a/aegisub/src/bitmaps/button/kara_split_cancel_64.png b/src/bitmaps/button/kara_split_cancel_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_split_cancel_64.png
rename to src/bitmaps/button/kara_split_cancel_64.png
diff --git a/aegisub/src/bitmaps/button/kara_timing_copier_16.png b/src/bitmaps/button/kara_timing_copier_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_timing_copier_16.png
rename to src/bitmaps/button/kara_timing_copier_16.png
diff --git a/aegisub/src/bitmaps/button/kara_timing_copier_24.png b/src/bitmaps/button/kara_timing_copier_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_timing_copier_24.png
rename to src/bitmaps/button/kara_timing_copier_24.png
diff --git a/aegisub/src/bitmaps/button/kara_timing_copier_32.png b/src/bitmaps/button/kara_timing_copier_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_timing_copier_32.png
rename to src/bitmaps/button/kara_timing_copier_32.png
diff --git a/aegisub/src/bitmaps/button/kara_timing_copier_48.png b/src/bitmaps/button/kara_timing_copier_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_timing_copier_48.png
rename to src/bitmaps/button/kara_timing_copier_48.png
diff --git a/aegisub/src/bitmaps/button/kara_timing_copier_64.png b/src/bitmaps/button/kara_timing_copier_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/kara_timing_copier_64.png
rename to src/bitmaps/button/kara_timing_copier_64.png
diff --git a/aegisub/src/bitmaps/button/languages_menu_16.png b/src/bitmaps/button/languages_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/languages_menu_16.png
rename to src/bitmaps/button/languages_menu_16.png
diff --git a/aegisub/src/bitmaps/button/languages_menu_24.png b/src/bitmaps/button/languages_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/languages_menu_24.png
rename to src/bitmaps/button/languages_menu_24.png
diff --git a/aegisub/src/bitmaps/button/languages_menu_32.png b/src/bitmaps/button/languages_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/languages_menu_32.png
rename to src/bitmaps/button/languages_menu_32.png
diff --git a/aegisub/src/bitmaps/button/languages_menu_48.png b/src/bitmaps/button/languages_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/languages_menu_48.png
rename to src/bitmaps/button/languages_menu_48.png
diff --git a/aegisub/src/bitmaps/button/languages_menu_64.png b/src/bitmaps/button/languages_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/languages_menu_64.png
rename to src/bitmaps/button/languages_menu_64.png
diff --git a/aegisub/src/bitmaps/button/new_toolbutton_16.png b/src/bitmaps/button/new_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_toolbutton_16.png
rename to src/bitmaps/button/new_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/new_toolbutton_24.png b/src/bitmaps/button/new_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_toolbutton_24.png
rename to src/bitmaps/button/new_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/new_toolbutton_32.png b/src/bitmaps/button/new_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_toolbutton_32.png
rename to src/bitmaps/button/new_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/new_toolbutton_48.png b/src/bitmaps/button/new_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_toolbutton_48.png
rename to src/bitmaps/button/new_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/new_toolbutton_64.png b/src/bitmaps/button/new_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_toolbutton_64.png
rename to src/bitmaps/button/new_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/new_window_menu_16.png b/src/bitmaps/button/new_window_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_window_menu_16.png
rename to src/bitmaps/button/new_window_menu_16.png
diff --git a/aegisub/src/bitmaps/button/new_window_menu_24.png b/src/bitmaps/button/new_window_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_window_menu_24.png
rename to src/bitmaps/button/new_window_menu_24.png
diff --git a/aegisub/src/bitmaps/button/new_window_menu_32.png b/src/bitmaps/button/new_window_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_window_menu_32.png
rename to src/bitmaps/button/new_window_menu_32.png
diff --git a/aegisub/src/bitmaps/button/new_window_menu_48.png b/src/bitmaps/button/new_window_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_window_menu_48.png
rename to src/bitmaps/button/new_window_menu_48.png
diff --git a/aegisub/src/bitmaps/button/new_window_menu_64.png b/src/bitmaps/button/new_window_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/new_window_menu_64.png
rename to src/bitmaps/button/new_window_menu_64.png
diff --git a/aegisub/src/bitmaps/button/open_audio_from_video_menu_16.png b/src/bitmaps/button/open_audio_from_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_from_video_menu_16.png
rename to src/bitmaps/button/open_audio_from_video_menu_16.png
diff --git a/aegisub/src/bitmaps/button/open_audio_from_video_menu_24.png b/src/bitmaps/button/open_audio_from_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_from_video_menu_24.png
rename to src/bitmaps/button/open_audio_from_video_menu_24.png
diff --git a/aegisub/src/bitmaps/button/open_audio_from_video_menu_32.png b/src/bitmaps/button/open_audio_from_video_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_from_video_menu_32.png
rename to src/bitmaps/button/open_audio_from_video_menu_32.png
diff --git a/aegisub/src/bitmaps/button/open_audio_from_video_menu_48.png b/src/bitmaps/button/open_audio_from_video_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_from_video_menu_48.png
rename to src/bitmaps/button/open_audio_from_video_menu_48.png
diff --git a/aegisub/src/bitmaps/button/open_audio_from_video_menu_64.png b/src/bitmaps/button/open_audio_from_video_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_from_video_menu_64.png
rename to src/bitmaps/button/open_audio_from_video_menu_64.png
diff --git a/aegisub/src/bitmaps/button/open_audio_menu_16.png b/src/bitmaps/button/open_audio_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_menu_16.png
rename to src/bitmaps/button/open_audio_menu_16.png
diff --git a/aegisub/src/bitmaps/button/open_audio_menu_24.png b/src/bitmaps/button/open_audio_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_menu_24.png
rename to src/bitmaps/button/open_audio_menu_24.png
diff --git a/aegisub/src/bitmaps/button/open_audio_menu_32.png b/src/bitmaps/button/open_audio_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_menu_32.png
rename to src/bitmaps/button/open_audio_menu_32.png
diff --git a/aegisub/src/bitmaps/button/open_audio_menu_48.png b/src/bitmaps/button/open_audio_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_menu_48.png
rename to src/bitmaps/button/open_audio_menu_48.png
diff --git a/aegisub/src/bitmaps/button/open_audio_menu_64.png b/src/bitmaps/button/open_audio_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_audio_menu_64.png
rename to src/bitmaps/button/open_audio_menu_64.png
diff --git a/aegisub/src/bitmaps/button/open_keyframes_menu_16.png b/src/bitmaps/button/open_keyframes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_keyframes_menu_16.png
rename to src/bitmaps/button/open_keyframes_menu_16.png
diff --git a/aegisub/src/bitmaps/button/open_keyframes_menu_24.png b/src/bitmaps/button/open_keyframes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_keyframes_menu_24.png
rename to src/bitmaps/button/open_keyframes_menu_24.png
diff --git a/aegisub/src/bitmaps/button/open_keyframes_menu_32.png b/src/bitmaps/button/open_keyframes_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_keyframes_menu_32.png
rename to src/bitmaps/button/open_keyframes_menu_32.png
diff --git a/aegisub/src/bitmaps/button/open_keyframes_menu_48.png b/src/bitmaps/button/open_keyframes_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_keyframes_menu_48.png
rename to src/bitmaps/button/open_keyframes_menu_48.png
diff --git a/aegisub/src/bitmaps/button/open_keyframes_menu_64.png b/src/bitmaps/button/open_keyframes_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_keyframes_menu_64.png
rename to src/bitmaps/button/open_keyframes_menu_64.png
diff --git a/aegisub/src/bitmaps/button/open_timecodes_menu_16.png b/src/bitmaps/button/open_timecodes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_timecodes_menu_16.png
rename to src/bitmaps/button/open_timecodes_menu_16.png
diff --git a/aegisub/src/bitmaps/button/open_timecodes_menu_24.png b/src/bitmaps/button/open_timecodes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_timecodes_menu_24.png
rename to src/bitmaps/button/open_timecodes_menu_24.png
diff --git a/aegisub/src/bitmaps/button/open_timecodes_menu_32.png b/src/bitmaps/button/open_timecodes_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_timecodes_menu_32.png
rename to src/bitmaps/button/open_timecodes_menu_32.png
diff --git a/aegisub/src/bitmaps/button/open_timecodes_menu_48.png b/src/bitmaps/button/open_timecodes_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_timecodes_menu_48.png
rename to src/bitmaps/button/open_timecodes_menu_48.png
diff --git a/aegisub/src/bitmaps/button/open_timecodes_menu_64.png b/src/bitmaps/button/open_timecodes_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_timecodes_menu_64.png
rename to src/bitmaps/button/open_timecodes_menu_64.png
diff --git a/aegisub/src/bitmaps/button/open_toolbutton_16.png b/src/bitmaps/button/open_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_toolbutton_16.png
rename to src/bitmaps/button/open_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/open_toolbutton_24.png b/src/bitmaps/button/open_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_toolbutton_24.png
rename to src/bitmaps/button/open_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/open_toolbutton_32.png b/src/bitmaps/button/open_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_toolbutton_32.png
rename to src/bitmaps/button/open_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/open_toolbutton_48.png b/src/bitmaps/button/open_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_toolbutton_48.png
rename to src/bitmaps/button/open_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/open_toolbutton_64.png b/src/bitmaps/button/open_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_toolbutton_64.png
rename to src/bitmaps/button/open_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/open_video_menu_16.png b/src/bitmaps/button/open_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_video_menu_16.png
rename to src/bitmaps/button/open_video_menu_16.png
diff --git a/aegisub/src/bitmaps/button/open_video_menu_24.png b/src/bitmaps/button/open_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_video_menu_24.png
rename to src/bitmaps/button/open_video_menu_24.png
diff --git a/aegisub/src/bitmaps/button/open_video_menu_32.png b/src/bitmaps/button/open_video_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_video_menu_32.png
rename to src/bitmaps/button/open_video_menu_32.png
diff --git a/aegisub/src/bitmaps/button/open_video_menu_48.png b/src/bitmaps/button/open_video_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_video_menu_48.png
rename to src/bitmaps/button/open_video_menu_48.png
diff --git a/aegisub/src/bitmaps/button/open_video_menu_64.png b/src/bitmaps/button/open_video_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_video_menu_64.png
rename to src/bitmaps/button/open_video_menu_64.png
diff --git a/aegisub/src/bitmaps/button/open_with_toolbutton_16.png b/src/bitmaps/button/open_with_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_with_toolbutton_16.png
rename to src/bitmaps/button/open_with_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/open_with_toolbutton_24.png b/src/bitmaps/button/open_with_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_with_toolbutton_24.png
rename to src/bitmaps/button/open_with_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/open_with_toolbutton_32.png b/src/bitmaps/button/open_with_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_with_toolbutton_32.png
rename to src/bitmaps/button/open_with_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/open_with_toolbutton_48.png b/src/bitmaps/button/open_with_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_with_toolbutton_48.png
rename to src/bitmaps/button/open_with_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/open_with_toolbutton_64.png b/src/bitmaps/button/open_with_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/open_with_toolbutton_64.png
rename to src/bitmaps/button/open_with_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/options_button_16.png b/src/bitmaps/button/options_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/options_button_16.png
rename to src/bitmaps/button/options_button_16.png
diff --git a/aegisub/src/bitmaps/button/options_button_24.png b/src/bitmaps/button/options_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/options_button_24.png
rename to src/bitmaps/button/options_button_24.png
diff --git a/aegisub/src/bitmaps/button/options_button_32.png b/src/bitmaps/button/options_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/options_button_32.png
rename to src/bitmaps/button/options_button_32.png
diff --git a/aegisub/src/bitmaps/button/options_button_48.png b/src/bitmaps/button/options_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/options_button_48.png
rename to src/bitmaps/button/options_button_48.png
diff --git a/aegisub/src/bitmaps/button/options_button_64.png b/src/bitmaps/button/options_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/options_button_64.png
rename to src/bitmaps/button/options_button_64.png
diff --git a/aegisub/src/bitmaps/button/paste_button_16.png b/src/bitmaps/button/paste_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/paste_button_16.png
rename to src/bitmaps/button/paste_button_16.png
diff --git a/aegisub/src/bitmaps/button/paste_button_24.png b/src/bitmaps/button/paste_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/paste_button_24.png
rename to src/bitmaps/button/paste_button_24.png
diff --git a/aegisub/src/bitmaps/button/paste_button_32.png b/src/bitmaps/button/paste_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/paste_button_32.png
rename to src/bitmaps/button/paste_button_32.png
diff --git a/aegisub/src/bitmaps/button/paste_button_48.png b/src/bitmaps/button/paste_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/paste_button_48.png
rename to src/bitmaps/button/paste_button_48.png
diff --git a/aegisub/src/bitmaps/button/paste_button_64.png b/src/bitmaps/button/paste_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/paste_button_64.png
rename to src/bitmaps/button/paste_button_64.png
diff --git a/aegisub/src/bitmaps/button/properties_toolbutton_16.png b/src/bitmaps/button/properties_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/properties_toolbutton_16.png
rename to src/bitmaps/button/properties_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/properties_toolbutton_24.png b/src/bitmaps/button/properties_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/properties_toolbutton_24.png
rename to src/bitmaps/button/properties_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/properties_toolbutton_32.png b/src/bitmaps/button/properties_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/properties_toolbutton_32.png
rename to src/bitmaps/button/properties_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/properties_toolbutton_48.png b/src/bitmaps/button/properties_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/properties_toolbutton_48.png
rename to src/bitmaps/button/properties_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/properties_toolbutton_64.png b/src/bitmaps/button/properties_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/properties_toolbutton_64.png
rename to src/bitmaps/button/properties_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/redo_button_16.png b/src/bitmaps/button/redo_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/redo_button_16.png
rename to src/bitmaps/button/redo_button_16.png
diff --git a/aegisub/src/bitmaps/button/redo_button_24.png b/src/bitmaps/button/redo_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/redo_button_24.png
rename to src/bitmaps/button/redo_button_24.png
diff --git a/aegisub/src/bitmaps/button/redo_button_32.png b/src/bitmaps/button/redo_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/redo_button_32.png
rename to src/bitmaps/button/redo_button_32.png
diff --git a/aegisub/src/bitmaps/button/redo_button_48.png b/src/bitmaps/button/redo_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/redo_button_48.png
rename to src/bitmaps/button/redo_button_48.png
diff --git a/aegisub/src/bitmaps/button/redo_button_64.png b/src/bitmaps/button/redo_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/redo_button_64.png
rename to src/bitmaps/button/redo_button_64.png
diff --git a/aegisub/src/bitmaps/button/resample_toolbutton_16.png b/src/bitmaps/button/resample_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/resample_toolbutton_16.png
rename to src/bitmaps/button/resample_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/resample_toolbutton_24.png b/src/bitmaps/button/resample_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/resample_toolbutton_24.png
rename to src/bitmaps/button/resample_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/resample_toolbutton_32.png b/src/bitmaps/button/resample_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/resample_toolbutton_32.png
rename to src/bitmaps/button/resample_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/resample_toolbutton_48.png b/src/bitmaps/button/resample_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/resample_toolbutton_48.png
rename to src/bitmaps/button/resample_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/resample_toolbutton_64.png b/src/bitmaps/button/resample_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/resample_toolbutton_64.png
rename to src/bitmaps/button/resample_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/save_as_toolbutton_16.png b/src/bitmaps/button/save_as_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_as_toolbutton_16.png
rename to src/bitmaps/button/save_as_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/save_as_toolbutton_24.png b/src/bitmaps/button/save_as_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_as_toolbutton_24.png
rename to src/bitmaps/button/save_as_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/save_as_toolbutton_32.png b/src/bitmaps/button/save_as_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_as_toolbutton_32.png
rename to src/bitmaps/button/save_as_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/save_as_toolbutton_48.png b/src/bitmaps/button/save_as_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_as_toolbutton_48.png
rename to src/bitmaps/button/save_as_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/save_as_toolbutton_64.png b/src/bitmaps/button/save_as_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_as_toolbutton_64.png
rename to src/bitmaps/button/save_as_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/save_keyframes_menu_16.png b/src/bitmaps/button/save_keyframes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_keyframes_menu_16.png
rename to src/bitmaps/button/save_keyframes_menu_16.png
diff --git a/aegisub/src/bitmaps/button/save_keyframes_menu_24.png b/src/bitmaps/button/save_keyframes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_keyframes_menu_24.png
rename to src/bitmaps/button/save_keyframes_menu_24.png
diff --git a/aegisub/src/bitmaps/button/save_keyframes_menu_32.png b/src/bitmaps/button/save_keyframes_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_keyframes_menu_32.png
rename to src/bitmaps/button/save_keyframes_menu_32.png
diff --git a/aegisub/src/bitmaps/button/save_keyframes_menu_48.png b/src/bitmaps/button/save_keyframes_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_keyframes_menu_48.png
rename to src/bitmaps/button/save_keyframes_menu_48.png
diff --git a/aegisub/src/bitmaps/button/save_keyframes_menu_64.png b/src/bitmaps/button/save_keyframes_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_keyframes_menu_64.png
rename to src/bitmaps/button/save_keyframes_menu_64.png
diff --git a/aegisub/src/bitmaps/button/save_timecodes_menu_16.png b/src/bitmaps/button/save_timecodes_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_timecodes_menu_16.png
rename to src/bitmaps/button/save_timecodes_menu_16.png
diff --git a/aegisub/src/bitmaps/button/save_timecodes_menu_24.png b/src/bitmaps/button/save_timecodes_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_timecodes_menu_24.png
rename to src/bitmaps/button/save_timecodes_menu_24.png
diff --git a/aegisub/src/bitmaps/button/save_timecodes_menu_32.png b/src/bitmaps/button/save_timecodes_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_timecodes_menu_32.png
rename to src/bitmaps/button/save_timecodes_menu_32.png
diff --git a/aegisub/src/bitmaps/button/save_timecodes_menu_48.png b/src/bitmaps/button/save_timecodes_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_timecodes_menu_48.png
rename to src/bitmaps/button/save_timecodes_menu_48.png
diff --git a/aegisub/src/bitmaps/button/save_timecodes_menu_64.png b/src/bitmaps/button/save_timecodes_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_timecodes_menu_64.png
rename to src/bitmaps/button/save_timecodes_menu_64.png
diff --git a/aegisub/src/bitmaps/button/save_toolbutton_16.png b/src/bitmaps/button/save_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_toolbutton_16.png
rename to src/bitmaps/button/save_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/save_toolbutton_24.png b/src/bitmaps/button/save_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_toolbutton_24.png
rename to src/bitmaps/button/save_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/save_toolbutton_32.png b/src/bitmaps/button/save_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_toolbutton_32.png
rename to src/bitmaps/button/save_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/save_toolbutton_48.png b/src/bitmaps/button/save_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_toolbutton_48.png
rename to src/bitmaps/button/save_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/save_toolbutton_64.png b/src/bitmaps/button/save_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/save_toolbutton_64.png
rename to src/bitmaps/button/save_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/select_lines_button_16.png b/src/bitmaps/button/select_lines_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_lines_button_16.png
rename to src/bitmaps/button/select_lines_button_16.png
diff --git a/aegisub/src/bitmaps/button/select_lines_button_24.png b/src/bitmaps/button/select_lines_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_lines_button_24.png
rename to src/bitmaps/button/select_lines_button_24.png
diff --git a/aegisub/src/bitmaps/button/select_lines_button_32.png b/src/bitmaps/button/select_lines_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_lines_button_32.png
rename to src/bitmaps/button/select_lines_button_32.png
diff --git a/aegisub/src/bitmaps/button/select_lines_button_48.png b/src/bitmaps/button/select_lines_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_lines_button_48.png
rename to src/bitmaps/button/select_lines_button_48.png
diff --git a/aegisub/src/bitmaps/button/select_lines_button_64.png b/src/bitmaps/button/select_lines_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_lines_button_64.png
rename to src/bitmaps/button/select_lines_button_64.png
diff --git a/aegisub/src/bitmaps/button/select_visible_button_16.png b/src/bitmaps/button/select_visible_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_visible_button_16.png
rename to src/bitmaps/button/select_visible_button_16.png
diff --git a/aegisub/src/bitmaps/button/select_visible_button_24.png b/src/bitmaps/button/select_visible_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_visible_button_24.png
rename to src/bitmaps/button/select_visible_button_24.png
diff --git a/aegisub/src/bitmaps/button/select_visible_button_32.png b/src/bitmaps/button/select_visible_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_visible_button_32.png
rename to src/bitmaps/button/select_visible_button_32.png
diff --git a/aegisub/src/bitmaps/button/select_visible_button_48.png b/src/bitmaps/button/select_visible_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_visible_button_48.png
rename to src/bitmaps/button/select_visible_button_48.png
diff --git a/aegisub/src/bitmaps/button/select_visible_button_64.png b/src/bitmaps/button/select_visible_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/select_visible_button_64.png
rename to src/bitmaps/button/select_visible_button_64.png
diff --git a/aegisub/src/bitmaps/button/shift_times_toolbutton_16.png b/src/bitmaps/button/shift_times_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_times_toolbutton_16.png
rename to src/bitmaps/button/shift_times_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/shift_times_toolbutton_24.png b/src/bitmaps/button/shift_times_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_times_toolbutton_24.png
rename to src/bitmaps/button/shift_times_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/shift_times_toolbutton_32.png b/src/bitmaps/button/shift_times_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_times_toolbutton_32.png
rename to src/bitmaps/button/shift_times_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/shift_times_toolbutton_48.png b/src/bitmaps/button/shift_times_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_times_toolbutton_48.png
rename to src/bitmaps/button/shift_times_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/shift_times_toolbutton_64.png b/src/bitmaps/button/shift_times_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_times_toolbutton_64.png
rename to src/bitmaps/button/shift_times_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/shift_to_frame_16.png b/src/bitmaps/button/shift_to_frame_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_to_frame_16.png
rename to src/bitmaps/button/shift_to_frame_16.png
diff --git a/aegisub/src/bitmaps/button/shift_to_frame_24.png b/src/bitmaps/button/shift_to_frame_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_to_frame_24.png
rename to src/bitmaps/button/shift_to_frame_24.png
diff --git a/aegisub/src/bitmaps/button/shift_to_frame_32.png b/src/bitmaps/button/shift_to_frame_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_to_frame_32.png
rename to src/bitmaps/button/shift_to_frame_32.png
diff --git a/aegisub/src/bitmaps/button/shift_to_frame_48.png b/src/bitmaps/button/shift_to_frame_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_to_frame_48.png
rename to src/bitmaps/button/shift_to_frame_48.png
diff --git a/aegisub/src/bitmaps/button/shift_to_frame_64.png b/src/bitmaps/button/shift_to_frame_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/shift_to_frame_64.png
rename to src/bitmaps/button/shift_to_frame_64.png
diff --git a/aegisub/src/bitmaps/button/show_video_details_menu_16.png b/src/bitmaps/button/show_video_details_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/show_video_details_menu_16.png
rename to src/bitmaps/button/show_video_details_menu_16.png
diff --git a/aegisub/src/bitmaps/button/show_video_details_menu_24.png b/src/bitmaps/button/show_video_details_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/show_video_details_menu_24.png
rename to src/bitmaps/button/show_video_details_menu_24.png
diff --git a/aegisub/src/bitmaps/button/show_video_details_menu_32.png b/src/bitmaps/button/show_video_details_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/show_video_details_menu_32.png
rename to src/bitmaps/button/show_video_details_menu_32.png
diff --git a/aegisub/src/bitmaps/button/show_video_details_menu_48.png b/src/bitmaps/button/show_video_details_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/show_video_details_menu_48.png
rename to src/bitmaps/button/show_video_details_menu_48.png
diff --git a/aegisub/src/bitmaps/button/show_video_details_menu_64.png b/src/bitmaps/button/show_video_details_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/show_video_details_menu_64.png
rename to src/bitmaps/button/show_video_details_menu_64.png
diff --git a/aegisub/src/bitmaps/button/snap_subs_to_scene_16.png b/src/bitmaps/button/snap_subs_to_scene_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/snap_subs_to_scene_16.png
rename to src/bitmaps/button/snap_subs_to_scene_16.png
diff --git a/aegisub/src/bitmaps/button/snap_subs_to_scene_24.png b/src/bitmaps/button/snap_subs_to_scene_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/snap_subs_to_scene_24.png
rename to src/bitmaps/button/snap_subs_to_scene_24.png
diff --git a/aegisub/src/bitmaps/button/snap_subs_to_scene_32.png b/src/bitmaps/button/snap_subs_to_scene_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/snap_subs_to_scene_32.png
rename to src/bitmaps/button/snap_subs_to_scene_32.png
diff --git a/aegisub/src/bitmaps/button/snap_subs_to_scene_48.png b/src/bitmaps/button/snap_subs_to_scene_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/snap_subs_to_scene_48.png
rename to src/bitmaps/button/snap_subs_to_scene_48.png
diff --git a/aegisub/src/bitmaps/button/snap_subs_to_scene_64.png b/src/bitmaps/button/snap_subs_to_scene_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/snap_subs_to_scene_64.png
rename to src/bitmaps/button/snap_subs_to_scene_64.png
diff --git a/aegisub/src/bitmaps/button/spellcheck_toolbutton_16.png b/src/bitmaps/button/spellcheck_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/spellcheck_toolbutton_16.png
rename to src/bitmaps/button/spellcheck_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/spellcheck_toolbutton_24.png b/src/bitmaps/button/spellcheck_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/spellcheck_toolbutton_24.png
rename to src/bitmaps/button/spellcheck_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/spellcheck_toolbutton_32.png b/src/bitmaps/button/spellcheck_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/spellcheck_toolbutton_32.png
rename to src/bitmaps/button/spellcheck_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/spellcheck_toolbutton_48.png b/src/bitmaps/button/spellcheck_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/spellcheck_toolbutton_48.png
rename to src/bitmaps/button/spellcheck_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/spellcheck_toolbutton_64.png b/src/bitmaps/button/spellcheck_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/spellcheck_toolbutton_64.png
rename to src/bitmaps/button/spellcheck_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/style_toolbutton_16.png b/src/bitmaps/button/style_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/style_toolbutton_16.png
rename to src/bitmaps/button/style_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/style_toolbutton_24.png b/src/bitmaps/button/style_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/style_toolbutton_24.png
rename to src/bitmaps/button/style_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/style_toolbutton_32.png b/src/bitmaps/button/style_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/style_toolbutton_32.png
rename to src/bitmaps/button/style_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/style_toolbutton_48.png b/src/bitmaps/button/style_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/style_toolbutton_48.png
rename to src/bitmaps/button/style_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/style_toolbutton_64.png b/src/bitmaps/button/style_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/style_toolbutton_64.png
rename to src/bitmaps/button/style_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/styling_toolbutton_16.png b/src/bitmaps/button/styling_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/styling_toolbutton_16.png
rename to src/bitmaps/button/styling_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/styling_toolbutton_24.png b/src/bitmaps/button/styling_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/styling_toolbutton_24.png
rename to src/bitmaps/button/styling_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/styling_toolbutton_32.png b/src/bitmaps/button/styling_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/styling_toolbutton_32.png
rename to src/bitmaps/button/styling_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/styling_toolbutton_48.png b/src/bitmaps/button/styling_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/styling_toolbutton_48.png
rename to src/bitmaps/button/styling_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/styling_toolbutton_64.png b/src/bitmaps/button/styling_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/styling_toolbutton_64.png
rename to src/bitmaps/button/styling_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/subend_to_video_16.png b/src/bitmaps/button/subend_to_video_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/subend_to_video_16.png
rename to src/bitmaps/button/subend_to_video_16.png
diff --git a/aegisub/src/bitmaps/button/subend_to_video_24.png b/src/bitmaps/button/subend_to_video_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/subend_to_video_24.png
rename to src/bitmaps/button/subend_to_video_24.png
diff --git a/aegisub/src/bitmaps/button/subend_to_video_32.png b/src/bitmaps/button/subend_to_video_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/subend_to_video_32.png
rename to src/bitmaps/button/subend_to_video_32.png
diff --git a/aegisub/src/bitmaps/button/subend_to_video_48.png b/src/bitmaps/button/subend_to_video_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/subend_to_video_48.png
rename to src/bitmaps/button/subend_to_video_48.png
diff --git a/aegisub/src/bitmaps/button/subend_to_video_64.png b/src/bitmaps/button/subend_to_video_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/subend_to_video_64.png
rename to src/bitmaps/button/subend_to_video_64.png
diff --git a/aegisub/src/bitmaps/button/substart_to_video_16.png b/src/bitmaps/button/substart_to_video_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/substart_to_video_16.png
rename to src/bitmaps/button/substart_to_video_16.png
diff --git a/aegisub/src/bitmaps/button/substart_to_video_24.png b/src/bitmaps/button/substart_to_video_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/substart_to_video_24.png
rename to src/bitmaps/button/substart_to_video_24.png
diff --git a/aegisub/src/bitmaps/button/substart_to_video_32.png b/src/bitmaps/button/substart_to_video_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/substart_to_video_32.png
rename to src/bitmaps/button/substart_to_video_32.png
diff --git a/aegisub/src/bitmaps/button/substart_to_video_48.png b/src/bitmaps/button/substart_to_video_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/substart_to_video_48.png
rename to src/bitmaps/button/substart_to_video_48.png
diff --git a/aegisub/src/bitmaps/button/substart_to_video_64.png b/src/bitmaps/button/substart_to_video_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/substart_to_video_64.png
rename to src/bitmaps/button/substart_to_video_64.png
diff --git a/aegisub/src/bitmaps/button/timing_processor_toolbutton_16.png b/src/bitmaps/button/timing_processor_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/timing_processor_toolbutton_16.png
rename to src/bitmaps/button/timing_processor_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/timing_processor_toolbutton_24.png b/src/bitmaps/button/timing_processor_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/timing_processor_toolbutton_24.png
rename to src/bitmaps/button/timing_processor_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/timing_processor_toolbutton_32.png b/src/bitmaps/button/timing_processor_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/timing_processor_toolbutton_32.png
rename to src/bitmaps/button/timing_processor_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/timing_processor_toolbutton_48.png b/src/bitmaps/button/timing_processor_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/timing_processor_toolbutton_48.png
rename to src/bitmaps/button/timing_processor_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/timing_processor_toolbutton_64.png b/src/bitmaps/button/timing_processor_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/timing_processor_toolbutton_64.png
rename to src/bitmaps/button/timing_processor_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autocommit_16.png b/src/bitmaps/button/toggle_audio_autocommit_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autocommit_16.png
rename to src/bitmaps/button/toggle_audio_autocommit_16.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autocommit_24.png b/src/bitmaps/button/toggle_audio_autocommit_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autocommit_24.png
rename to src/bitmaps/button/toggle_audio_autocommit_24.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autocommit_32.png b/src/bitmaps/button/toggle_audio_autocommit_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autocommit_32.png
rename to src/bitmaps/button/toggle_audio_autocommit_32.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autocommit_48.png b/src/bitmaps/button/toggle_audio_autocommit_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autocommit_48.png
rename to src/bitmaps/button/toggle_audio_autocommit_48.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autocommit_64.png b/src/bitmaps/button/toggle_audio_autocommit_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autocommit_64.png
rename to src/bitmaps/button/toggle_audio_autocommit_64.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autoscroll_16.png b/src/bitmaps/button/toggle_audio_autoscroll_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autoscroll_16.png
rename to src/bitmaps/button/toggle_audio_autoscroll_16.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autoscroll_24.png b/src/bitmaps/button/toggle_audio_autoscroll_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autoscroll_24.png
rename to src/bitmaps/button/toggle_audio_autoscroll_24.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autoscroll_32.png b/src/bitmaps/button/toggle_audio_autoscroll_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autoscroll_32.png
rename to src/bitmaps/button/toggle_audio_autoscroll_32.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autoscroll_48.png b/src/bitmaps/button/toggle_audio_autoscroll_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autoscroll_48.png
rename to src/bitmaps/button/toggle_audio_autoscroll_48.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_autoscroll_64.png b/src/bitmaps/button/toggle_audio_autoscroll_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_autoscroll_64.png
rename to src/bitmaps/button/toggle_audio_autoscroll_64.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_link_16.png b/src/bitmaps/button/toggle_audio_link_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_link_16.png
rename to src/bitmaps/button/toggle_audio_link_16.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_link_24.png b/src/bitmaps/button/toggle_audio_link_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_link_24.png
rename to src/bitmaps/button/toggle_audio_link_24.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_link_32.png b/src/bitmaps/button/toggle_audio_link_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_link_32.png
rename to src/bitmaps/button/toggle_audio_link_32.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_link_48.png b/src/bitmaps/button/toggle_audio_link_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_link_48.png
rename to src/bitmaps/button/toggle_audio_link_48.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_link_64.png b/src/bitmaps/button/toggle_audio_link_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_link_64.png
rename to src/bitmaps/button/toggle_audio_link_64.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_medusa_16.png b/src/bitmaps/button/toggle_audio_medusa_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_medusa_16.png
rename to src/bitmaps/button/toggle_audio_medusa_16.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_medusa_24.png b/src/bitmaps/button/toggle_audio_medusa_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_medusa_24.png
rename to src/bitmaps/button/toggle_audio_medusa_24.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_medusa_32.png b/src/bitmaps/button/toggle_audio_medusa_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_medusa_32.png
rename to src/bitmaps/button/toggle_audio_medusa_32.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_medusa_48.png b/src/bitmaps/button/toggle_audio_medusa_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_medusa_48.png
rename to src/bitmaps/button/toggle_audio_medusa_48.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_medusa_64.png b/src/bitmaps/button/toggle_audio_medusa_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_medusa_64.png
rename to src/bitmaps/button/toggle_audio_medusa_64.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_nextcommit_16.png b/src/bitmaps/button/toggle_audio_nextcommit_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_nextcommit_16.png
rename to src/bitmaps/button/toggle_audio_nextcommit_16.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_nextcommit_24.png b/src/bitmaps/button/toggle_audio_nextcommit_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_nextcommit_24.png
rename to src/bitmaps/button/toggle_audio_nextcommit_24.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_nextcommit_32.png b/src/bitmaps/button/toggle_audio_nextcommit_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_nextcommit_32.png
rename to src/bitmaps/button/toggle_audio_nextcommit_32.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_nextcommit_48.png b/src/bitmaps/button/toggle_audio_nextcommit_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_nextcommit_48.png
rename to src/bitmaps/button/toggle_audio_nextcommit_48.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_nextcommit_64.png b/src/bitmaps/button/toggle_audio_nextcommit_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_nextcommit_64.png
rename to src/bitmaps/button/toggle_audio_nextcommit_64.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_spectrum_16.png b/src/bitmaps/button/toggle_audio_spectrum_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_spectrum_16.png
rename to src/bitmaps/button/toggle_audio_spectrum_16.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_spectrum_24.png b/src/bitmaps/button/toggle_audio_spectrum_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_spectrum_24.png
rename to src/bitmaps/button/toggle_audio_spectrum_24.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_spectrum_32.png b/src/bitmaps/button/toggle_audio_spectrum_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_spectrum_32.png
rename to src/bitmaps/button/toggle_audio_spectrum_32.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_spectrum_48.png b/src/bitmaps/button/toggle_audio_spectrum_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_spectrum_48.png
rename to src/bitmaps/button/toggle_audio_spectrum_48.png
diff --git a/aegisub/src/bitmaps/button/toggle_audio_spectrum_64.png b/src/bitmaps/button/toggle_audio_spectrum_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_audio_spectrum_64.png
rename to src/bitmaps/button/toggle_audio_spectrum_64.png
diff --git a/aegisub/src/bitmaps/button/toggle_tag_hiding_16.png b/src/bitmaps/button/toggle_tag_hiding_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_tag_hiding_16.png
rename to src/bitmaps/button/toggle_tag_hiding_16.png
diff --git a/aegisub/src/bitmaps/button/toggle_tag_hiding_24.png b/src/bitmaps/button/toggle_tag_hiding_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_tag_hiding_24.png
rename to src/bitmaps/button/toggle_tag_hiding_24.png
diff --git a/aegisub/src/bitmaps/button/toggle_tag_hiding_32.png b/src/bitmaps/button/toggle_tag_hiding_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_tag_hiding_32.png
rename to src/bitmaps/button/toggle_tag_hiding_32.png
diff --git a/aegisub/src/bitmaps/button/toggle_tag_hiding_48.png b/src/bitmaps/button/toggle_tag_hiding_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_tag_hiding_48.png
rename to src/bitmaps/button/toggle_tag_hiding_48.png
diff --git a/aegisub/src/bitmaps/button/toggle_tag_hiding_64.png b/src/bitmaps/button/toggle_tag_hiding_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_tag_hiding_64.png
rename to src/bitmaps/button/toggle_tag_hiding_64.png
diff --git a/aegisub/src/bitmaps/button/toggle_video_autoscroll_16.png b/src/bitmaps/button/toggle_video_autoscroll_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_video_autoscroll_16.png
rename to src/bitmaps/button/toggle_video_autoscroll_16.png
diff --git a/aegisub/src/bitmaps/button/toggle_video_autoscroll_24.png b/src/bitmaps/button/toggle_video_autoscroll_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_video_autoscroll_24.png
rename to src/bitmaps/button/toggle_video_autoscroll_24.png
diff --git a/aegisub/src/bitmaps/button/toggle_video_autoscroll_32.png b/src/bitmaps/button/toggle_video_autoscroll_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_video_autoscroll_32.png
rename to src/bitmaps/button/toggle_video_autoscroll_32.png
diff --git a/aegisub/src/bitmaps/button/toggle_video_autoscroll_48.png b/src/bitmaps/button/toggle_video_autoscroll_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_video_autoscroll_48.png
rename to src/bitmaps/button/toggle_video_autoscroll_48.png
diff --git a/aegisub/src/bitmaps/button/toggle_video_autoscroll_64.png b/src/bitmaps/button/toggle_video_autoscroll_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/toggle_video_autoscroll_64.png
rename to src/bitmaps/button/toggle_video_autoscroll_64.png
diff --git a/aegisub/src/bitmaps/button/translation_toolbutton_16.png b/src/bitmaps/button/translation_toolbutton_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/translation_toolbutton_16.png
rename to src/bitmaps/button/translation_toolbutton_16.png
diff --git a/aegisub/src/bitmaps/button/translation_toolbutton_24.png b/src/bitmaps/button/translation_toolbutton_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/translation_toolbutton_24.png
rename to src/bitmaps/button/translation_toolbutton_24.png
diff --git a/aegisub/src/bitmaps/button/translation_toolbutton_32.png b/src/bitmaps/button/translation_toolbutton_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/translation_toolbutton_32.png
rename to src/bitmaps/button/translation_toolbutton_32.png
diff --git a/aegisub/src/bitmaps/button/translation_toolbutton_48.png b/src/bitmaps/button/translation_toolbutton_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/translation_toolbutton_48.png
rename to src/bitmaps/button/translation_toolbutton_48.png
diff --git a/aegisub/src/bitmaps/button/translation_toolbutton_64.png b/src/bitmaps/button/translation_toolbutton_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/translation_toolbutton_64.png
rename to src/bitmaps/button/translation_toolbutton_64.png
diff --git a/aegisub/src/bitmaps/button/undo_button_16.png b/src/bitmaps/button/undo_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/undo_button_16.png
rename to src/bitmaps/button/undo_button_16.png
diff --git a/aegisub/src/bitmaps/button/undo_button_24.png b/src/bitmaps/button/undo_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/undo_button_24.png
rename to src/bitmaps/button/undo_button_24.png
diff --git a/aegisub/src/bitmaps/button/undo_button_32.png b/src/bitmaps/button/undo_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/undo_button_32.png
rename to src/bitmaps/button/undo_button_32.png
diff --git a/aegisub/src/bitmaps/button/undo_button_48.png b/src/bitmaps/button/undo_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/undo_button_48.png
rename to src/bitmaps/button/undo_button_48.png
diff --git a/aegisub/src/bitmaps/button/undo_button_64.png b/src/bitmaps/button/undo_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/undo_button_64.png
rename to src/bitmaps/button/undo_button_64.png
diff --git a/aegisub/src/bitmaps/button/use_dummy_video_menu_16.png b/src/bitmaps/button/use_dummy_video_menu_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/use_dummy_video_menu_16.png
rename to src/bitmaps/button/use_dummy_video_menu_16.png
diff --git a/aegisub/src/bitmaps/button/use_dummy_video_menu_24.png b/src/bitmaps/button/use_dummy_video_menu_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/use_dummy_video_menu_24.png
rename to src/bitmaps/button/use_dummy_video_menu_24.png
diff --git a/aegisub/src/bitmaps/button/use_dummy_video_menu_32.png b/src/bitmaps/button/use_dummy_video_menu_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/use_dummy_video_menu_32.png
rename to src/bitmaps/button/use_dummy_video_menu_32.png
diff --git a/aegisub/src/bitmaps/button/use_dummy_video_menu_48.png b/src/bitmaps/button/use_dummy_video_menu_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/use_dummy_video_menu_48.png
rename to src/bitmaps/button/use_dummy_video_menu_48.png
diff --git a/aegisub/src/bitmaps/button/use_dummy_video_menu_64.png b/src/bitmaps/button/use_dummy_video_menu_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/use_dummy_video_menu_64.png
rename to src/bitmaps/button/use_dummy_video_menu_64.png
diff --git a/aegisub/src/bitmaps/button/video_to_subend_16.png b/src/bitmaps/button/video_to_subend_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_subend_16.png
rename to src/bitmaps/button/video_to_subend_16.png
diff --git a/aegisub/src/bitmaps/button/video_to_subend_24.png b/src/bitmaps/button/video_to_subend_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_subend_24.png
rename to src/bitmaps/button/video_to_subend_24.png
diff --git a/aegisub/src/bitmaps/button/video_to_subend_32.png b/src/bitmaps/button/video_to_subend_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_subend_32.png
rename to src/bitmaps/button/video_to_subend_32.png
diff --git a/aegisub/src/bitmaps/button/video_to_subend_48.png b/src/bitmaps/button/video_to_subend_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_subend_48.png
rename to src/bitmaps/button/video_to_subend_48.png
diff --git a/aegisub/src/bitmaps/button/video_to_subend_64.png b/src/bitmaps/button/video_to_subend_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_subend_64.png
rename to src/bitmaps/button/video_to_subend_64.png
diff --git a/aegisub/src/bitmaps/button/video_to_substart_16.png b/src/bitmaps/button/video_to_substart_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_substart_16.png
rename to src/bitmaps/button/video_to_substart_16.png
diff --git a/aegisub/src/bitmaps/button/video_to_substart_24.png b/src/bitmaps/button/video_to_substart_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_substart_24.png
rename to src/bitmaps/button/video_to_substart_24.png
diff --git a/aegisub/src/bitmaps/button/video_to_substart_32.png b/src/bitmaps/button/video_to_substart_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_substart_32.png
rename to src/bitmaps/button/video_to_substart_32.png
diff --git a/aegisub/src/bitmaps/button/video_to_substart_48.png b/src/bitmaps/button/video_to_substart_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_substart_48.png
rename to src/bitmaps/button/video_to_substart_48.png
diff --git a/aegisub/src/bitmaps/button/video_to_substart_64.png b/src/bitmaps/button/video_to_substart_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/video_to_substart_64.png
rename to src/bitmaps/button/video_to_substart_64.png
diff --git a/aegisub/src/bitmaps/button/visual_clip_16.png b/src/bitmaps/button/visual_clip_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_clip_16.png
rename to src/bitmaps/button/visual_clip_16.png
diff --git a/aegisub/src/bitmaps/button/visual_clip_24.png b/src/bitmaps/button/visual_clip_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_clip_24.png
rename to src/bitmaps/button/visual_clip_24.png
diff --git a/aegisub/src/bitmaps/button/visual_clip_32.png b/src/bitmaps/button/visual_clip_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_clip_32.png
rename to src/bitmaps/button/visual_clip_32.png
diff --git a/aegisub/src/bitmaps/button/visual_clip_48.png b/src/bitmaps/button/visual_clip_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_clip_48.png
rename to src/bitmaps/button/visual_clip_48.png
diff --git a/aegisub/src/bitmaps/button/visual_clip_64.png b/src/bitmaps/button/visual_clip_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_clip_64.png
rename to src/bitmaps/button/visual_clip_64.png
diff --git a/aegisub/src/bitmaps/button/visual_help_16.png b/src/bitmaps/button/visual_help_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_help_16.png
rename to src/bitmaps/button/visual_help_16.png
diff --git a/aegisub/src/bitmaps/button/visual_help_24.png b/src/bitmaps/button/visual_help_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_help_24.png
rename to src/bitmaps/button/visual_help_24.png
diff --git a/aegisub/src/bitmaps/button/visual_help_32.png b/src/bitmaps/button/visual_help_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_help_32.png
rename to src/bitmaps/button/visual_help_32.png
diff --git a/aegisub/src/bitmaps/button/visual_help_48.png b/src/bitmaps/button/visual_help_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_help_48.png
rename to src/bitmaps/button/visual_help_48.png
diff --git a/aegisub/src/bitmaps/button/visual_help_64.png b/src/bitmaps/button/visual_help_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_help_64.png
rename to src/bitmaps/button/visual_help_64.png
diff --git a/aegisub/src/bitmaps/button/visual_move_16.png b/src/bitmaps/button/visual_move_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_16.png
rename to src/bitmaps/button/visual_move_16.png
diff --git a/aegisub/src/bitmaps/button/visual_move_24.png b/src/bitmaps/button/visual_move_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_24.png
rename to src/bitmaps/button/visual_move_24.png
diff --git a/aegisub/src/bitmaps/button/visual_move_32.png b/src/bitmaps/button/visual_move_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_32.png
rename to src/bitmaps/button/visual_move_32.png
diff --git a/aegisub/src/bitmaps/button/visual_move_48.png b/src/bitmaps/button/visual_move_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_48.png
rename to src/bitmaps/button/visual_move_48.png
diff --git a/aegisub/src/bitmaps/button/visual_move_64.png b/src/bitmaps/button/visual_move_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_64.png
rename to src/bitmaps/button/visual_move_64.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_move_16.png b/src/bitmaps/button/visual_move_conv_move_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_move_16.png
rename to src/bitmaps/button/visual_move_conv_move_16.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_move_24.png b/src/bitmaps/button/visual_move_conv_move_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_move_24.png
rename to src/bitmaps/button/visual_move_conv_move_24.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_move_32.png b/src/bitmaps/button/visual_move_conv_move_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_move_32.png
rename to src/bitmaps/button/visual_move_conv_move_32.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_move_48.png b/src/bitmaps/button/visual_move_conv_move_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_move_48.png
rename to src/bitmaps/button/visual_move_conv_move_48.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_move_64.png b/src/bitmaps/button/visual_move_conv_move_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_move_64.png
rename to src/bitmaps/button/visual_move_conv_move_64.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_pos_16.png b/src/bitmaps/button/visual_move_conv_pos_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_pos_16.png
rename to src/bitmaps/button/visual_move_conv_pos_16.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_pos_24.png b/src/bitmaps/button/visual_move_conv_pos_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_pos_24.png
rename to src/bitmaps/button/visual_move_conv_pos_24.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_pos_32.png b/src/bitmaps/button/visual_move_conv_pos_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_pos_32.png
rename to src/bitmaps/button/visual_move_conv_pos_32.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_pos_48.png b/src/bitmaps/button/visual_move_conv_pos_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_pos_48.png
rename to src/bitmaps/button/visual_move_conv_pos_48.png
diff --git a/aegisub/src/bitmaps/button/visual_move_conv_pos_64.png b/src/bitmaps/button/visual_move_conv_pos_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_move_conv_pos_64.png
rename to src/bitmaps/button/visual_move_conv_pos_64.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatexy_16.png b/src/bitmaps/button/visual_rotatexy_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatexy_16.png
rename to src/bitmaps/button/visual_rotatexy_16.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatexy_24.png b/src/bitmaps/button/visual_rotatexy_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatexy_24.png
rename to src/bitmaps/button/visual_rotatexy_24.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatexy_32.png b/src/bitmaps/button/visual_rotatexy_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatexy_32.png
rename to src/bitmaps/button/visual_rotatexy_32.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatexy_48.png b/src/bitmaps/button/visual_rotatexy_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatexy_48.png
rename to src/bitmaps/button/visual_rotatexy_48.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatexy_64.png b/src/bitmaps/button/visual_rotatexy_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatexy_64.png
rename to src/bitmaps/button/visual_rotatexy_64.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatez_16.png b/src/bitmaps/button/visual_rotatez_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatez_16.png
rename to src/bitmaps/button/visual_rotatez_16.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatez_24.png b/src/bitmaps/button/visual_rotatez_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatez_24.png
rename to src/bitmaps/button/visual_rotatez_24.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatez_32.png b/src/bitmaps/button/visual_rotatez_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatez_32.png
rename to src/bitmaps/button/visual_rotatez_32.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatez_48.png b/src/bitmaps/button/visual_rotatez_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatez_48.png
rename to src/bitmaps/button/visual_rotatez_48.png
diff --git a/aegisub/src/bitmaps/button/visual_rotatez_64.png b/src/bitmaps/button/visual_rotatez_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_rotatez_64.png
rename to src/bitmaps/button/visual_rotatez_64.png
diff --git a/aegisub/src/bitmaps/button/visual_scale_16.png b/src/bitmaps/button/visual_scale_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_scale_16.png
rename to src/bitmaps/button/visual_scale_16.png
diff --git a/aegisub/src/bitmaps/button/visual_scale_24.png b/src/bitmaps/button/visual_scale_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_scale_24.png
rename to src/bitmaps/button/visual_scale_24.png
diff --git a/aegisub/src/bitmaps/button/visual_scale_32.png b/src/bitmaps/button/visual_scale_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_scale_32.png
rename to src/bitmaps/button/visual_scale_32.png
diff --git a/aegisub/src/bitmaps/button/visual_scale_48.png b/src/bitmaps/button/visual_scale_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_scale_48.png
rename to src/bitmaps/button/visual_scale_48.png
diff --git a/aegisub/src/bitmaps/button/visual_scale_64.png b/src/bitmaps/button/visual_scale_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_scale_64.png
rename to src/bitmaps/button/visual_scale_64.png
diff --git a/aegisub/src/bitmaps/button/visual_standard_16.png b/src/bitmaps/button/visual_standard_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_standard_16.png
rename to src/bitmaps/button/visual_standard_16.png
diff --git a/aegisub/src/bitmaps/button/visual_standard_24.png b/src/bitmaps/button/visual_standard_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_standard_24.png
rename to src/bitmaps/button/visual_standard_24.png
diff --git a/aegisub/src/bitmaps/button/visual_standard_32.png b/src/bitmaps/button/visual_standard_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_standard_32.png
rename to src/bitmaps/button/visual_standard_32.png
diff --git a/aegisub/src/bitmaps/button/visual_standard_48.png b/src/bitmaps/button/visual_standard_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_standard_48.png
rename to src/bitmaps/button/visual_standard_48.png
diff --git a/aegisub/src/bitmaps/button/visual_standard_64.png b/src/bitmaps/button/visual_standard_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_standard_64.png
rename to src/bitmaps/button/visual_standard_64.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_16.png b/src/bitmaps/button/visual_vector_clip_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_16.png
rename to src/bitmaps/button/visual_vector_clip_16.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_24.png b/src/bitmaps/button/visual_vector_clip_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_24.png
rename to src/bitmaps/button/visual_vector_clip_24.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_32.png b/src/bitmaps/button/visual_vector_clip_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_32.png
rename to src/bitmaps/button/visual_vector_clip_32.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_48.png b/src/bitmaps/button/visual_vector_clip_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_48.png
rename to src/bitmaps/button/visual_vector_clip_48.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_64.png b/src/bitmaps/button/visual_vector_clip_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_64.png
rename to src/bitmaps/button/visual_vector_clip_64.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_bicubic_16.png b/src/bitmaps/button/visual_vector_clip_bicubic_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_bicubic_16.png
rename to src/bitmaps/button/visual_vector_clip_bicubic_16.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_bicubic_24.png b/src/bitmaps/button/visual_vector_clip_bicubic_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_bicubic_24.png
rename to src/bitmaps/button/visual_vector_clip_bicubic_24.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_bicubic_32.png b/src/bitmaps/button/visual_vector_clip_bicubic_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_bicubic_32.png
rename to src/bitmaps/button/visual_vector_clip_bicubic_32.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_bicubic_48.png b/src/bitmaps/button/visual_vector_clip_bicubic_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_bicubic_48.png
rename to src/bitmaps/button/visual_vector_clip_bicubic_48.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_bicubic_64.png b/src/bitmaps/button/visual_vector_clip_bicubic_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_bicubic_64.png
rename to src/bitmaps/button/visual_vector_clip_bicubic_64.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_convert_16.png b/src/bitmaps/button/visual_vector_clip_convert_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_convert_16.png
rename to src/bitmaps/button/visual_vector_clip_convert_16.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_convert_24.png b/src/bitmaps/button/visual_vector_clip_convert_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_convert_24.png
rename to src/bitmaps/button/visual_vector_clip_convert_24.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_convert_32.png b/src/bitmaps/button/visual_vector_clip_convert_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_convert_32.png
rename to src/bitmaps/button/visual_vector_clip_convert_32.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_convert_48.png b/src/bitmaps/button/visual_vector_clip_convert_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_convert_48.png
rename to src/bitmaps/button/visual_vector_clip_convert_48.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_convert_64.png b/src/bitmaps/button/visual_vector_clip_convert_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_convert_64.png
rename to src/bitmaps/button/visual_vector_clip_convert_64.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_drag_16.png b/src/bitmaps/button/visual_vector_clip_drag_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_drag_16.png
rename to src/bitmaps/button/visual_vector_clip_drag_16.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_drag_24.png b/src/bitmaps/button/visual_vector_clip_drag_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_drag_24.png
rename to src/bitmaps/button/visual_vector_clip_drag_24.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_drag_32.png b/src/bitmaps/button/visual_vector_clip_drag_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_drag_32.png
rename to src/bitmaps/button/visual_vector_clip_drag_32.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_drag_48.png b/src/bitmaps/button/visual_vector_clip_drag_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_drag_48.png
rename to src/bitmaps/button/visual_vector_clip_drag_48.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_drag_64.png b/src/bitmaps/button/visual_vector_clip_drag_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_drag_64.png
rename to src/bitmaps/button/visual_vector_clip_drag_64.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_16.png b/src/bitmaps/button/visual_vector_clip_freehand_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_16.png
rename to src/bitmaps/button/visual_vector_clip_freehand_16.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_24.png b/src/bitmaps/button/visual_vector_clip_freehand_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_24.png
rename to src/bitmaps/button/visual_vector_clip_freehand_24.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_32.png b/src/bitmaps/button/visual_vector_clip_freehand_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_32.png
rename to src/bitmaps/button/visual_vector_clip_freehand_32.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_48.png b/src/bitmaps/button/visual_vector_clip_freehand_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_48.png
rename to src/bitmaps/button/visual_vector_clip_freehand_48.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_64.png b/src/bitmaps/button/visual_vector_clip_freehand_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_64.png
rename to src/bitmaps/button/visual_vector_clip_freehand_64.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_16.png b/src/bitmaps/button/visual_vector_clip_freehand_smooth_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_16.png
rename to src/bitmaps/button/visual_vector_clip_freehand_smooth_16.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_24.png b/src/bitmaps/button/visual_vector_clip_freehand_smooth_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_24.png
rename to src/bitmaps/button/visual_vector_clip_freehand_smooth_24.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_32.png b/src/bitmaps/button/visual_vector_clip_freehand_smooth_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_32.png
rename to src/bitmaps/button/visual_vector_clip_freehand_smooth_32.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_48.png b/src/bitmaps/button/visual_vector_clip_freehand_smooth_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_48.png
rename to src/bitmaps/button/visual_vector_clip_freehand_smooth_48.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_64.png b/src/bitmaps/button/visual_vector_clip_freehand_smooth_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_freehand_smooth_64.png
rename to src/bitmaps/button/visual_vector_clip_freehand_smooth_64.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_insert_16.png b/src/bitmaps/button/visual_vector_clip_insert_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_insert_16.png
rename to src/bitmaps/button/visual_vector_clip_insert_16.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_insert_24.png b/src/bitmaps/button/visual_vector_clip_insert_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_insert_24.png
rename to src/bitmaps/button/visual_vector_clip_insert_24.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_insert_32.png b/src/bitmaps/button/visual_vector_clip_insert_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_insert_32.png
rename to src/bitmaps/button/visual_vector_clip_insert_32.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_insert_48.png b/src/bitmaps/button/visual_vector_clip_insert_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_insert_48.png
rename to src/bitmaps/button/visual_vector_clip_insert_48.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_insert_64.png b/src/bitmaps/button/visual_vector_clip_insert_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_insert_64.png
rename to src/bitmaps/button/visual_vector_clip_insert_64.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_line_16.png b/src/bitmaps/button/visual_vector_clip_line_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_line_16.png
rename to src/bitmaps/button/visual_vector_clip_line_16.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_line_24.png b/src/bitmaps/button/visual_vector_clip_line_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_line_24.png
rename to src/bitmaps/button/visual_vector_clip_line_24.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_line_32.png b/src/bitmaps/button/visual_vector_clip_line_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_line_32.png
rename to src/bitmaps/button/visual_vector_clip_line_32.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_line_48.png b/src/bitmaps/button/visual_vector_clip_line_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_line_48.png
rename to src/bitmaps/button/visual_vector_clip_line_48.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_line_64.png b/src/bitmaps/button/visual_vector_clip_line_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_line_64.png
rename to src/bitmaps/button/visual_vector_clip_line_64.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_remove_16.png b/src/bitmaps/button/visual_vector_clip_remove_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_remove_16.png
rename to src/bitmaps/button/visual_vector_clip_remove_16.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_remove_24.png b/src/bitmaps/button/visual_vector_clip_remove_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_remove_24.png
rename to src/bitmaps/button/visual_vector_clip_remove_24.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_remove_32.png b/src/bitmaps/button/visual_vector_clip_remove_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_remove_32.png
rename to src/bitmaps/button/visual_vector_clip_remove_32.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_remove_48.png b/src/bitmaps/button/visual_vector_clip_remove_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_remove_48.png
rename to src/bitmaps/button/visual_vector_clip_remove_48.png
diff --git a/aegisub/src/bitmaps/button/visual_vector_clip_remove_64.png b/src/bitmaps/button/visual_vector_clip_remove_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/visual_vector_clip_remove_64.png
rename to src/bitmaps/button/visual_vector_clip_remove_64.png
diff --git a/aegisub/src/bitmaps/button/website_button_16.png b/src/bitmaps/button/website_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/website_button_16.png
rename to src/bitmaps/button/website_button_16.png
diff --git a/aegisub/src/bitmaps/button/website_button_24.png b/src/bitmaps/button/website_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/website_button_24.png
rename to src/bitmaps/button/website_button_24.png
diff --git a/aegisub/src/bitmaps/button/website_button_32.png b/src/bitmaps/button/website_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/website_button_32.png
rename to src/bitmaps/button/website_button_32.png
diff --git a/aegisub/src/bitmaps/button/website_button_48.png b/src/bitmaps/button/website_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/website_button_48.png
rename to src/bitmaps/button/website_button_48.png
diff --git a/aegisub/src/bitmaps/button/website_button_64.png b/src/bitmaps/button/website_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/website_button_64.png
rename to src/bitmaps/button/website_button_64.png
diff --git a/aegisub/src/bitmaps/button/zoom_in_button_16.png b/src/bitmaps/button/zoom_in_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_in_button_16.png
rename to src/bitmaps/button/zoom_in_button_16.png
diff --git a/aegisub/src/bitmaps/button/zoom_in_button_24.png b/src/bitmaps/button/zoom_in_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_in_button_24.png
rename to src/bitmaps/button/zoom_in_button_24.png
diff --git a/aegisub/src/bitmaps/button/zoom_in_button_32.png b/src/bitmaps/button/zoom_in_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_in_button_32.png
rename to src/bitmaps/button/zoom_in_button_32.png
diff --git a/aegisub/src/bitmaps/button/zoom_in_button_48.png b/src/bitmaps/button/zoom_in_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_in_button_48.png
rename to src/bitmaps/button/zoom_in_button_48.png
diff --git a/aegisub/src/bitmaps/button/zoom_in_button_64.png b/src/bitmaps/button/zoom_in_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_in_button_64.png
rename to src/bitmaps/button/zoom_in_button_64.png
diff --git a/aegisub/src/bitmaps/button/zoom_out_button_16.png b/src/bitmaps/button/zoom_out_button_16.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_out_button_16.png
rename to src/bitmaps/button/zoom_out_button_16.png
diff --git a/aegisub/src/bitmaps/button/zoom_out_button_24.png b/src/bitmaps/button/zoom_out_button_24.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_out_button_24.png
rename to src/bitmaps/button/zoom_out_button_24.png
diff --git a/aegisub/src/bitmaps/button/zoom_out_button_32.png b/src/bitmaps/button/zoom_out_button_32.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_out_button_32.png
rename to src/bitmaps/button/zoom_out_button_32.png
diff --git a/aegisub/src/bitmaps/button/zoom_out_button_48.png b/src/bitmaps/button/zoom_out_button_48.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_out_button_48.png
rename to src/bitmaps/button/zoom_out_button_48.png
diff --git a/aegisub/src/bitmaps/button/zoom_out_button_64.png b/src/bitmaps/button/zoom_out_button_64.png
similarity index 100%
rename from aegisub/src/bitmaps/button/zoom_out_button_64.png
rename to src/bitmaps/button/zoom_out_button_64.png
diff --git a/aegisub/src/bitmaps/manifest.respack b/src/bitmaps/manifest.respack
similarity index 100%
rename from aegisub/src/bitmaps/manifest.respack
rename to src/bitmaps/manifest.respack
diff --git a/aegisub/src/bitmaps/misc/splash.png b/src/bitmaps/misc/splash.png
similarity index 100%
rename from aegisub/src/bitmaps/misc/splash.png
rename to src/bitmaps/misc/splash.png
diff --git a/aegisub/src/bitmaps/misc/wxicon.png b/src/bitmaps/misc/wxicon.png
similarity index 100%
rename from aegisub/src/bitmaps/misc/wxicon.png
rename to src/bitmaps/misc/wxicon.png
diff --git a/aegisub/src/bitmaps/windows/eyedropper.cur b/src/bitmaps/windows/eyedropper.cur
similarity index 100%
rename from aegisub/src/bitmaps/windows/eyedropper.cur
rename to src/bitmaps/windows/eyedropper.cur
diff --git a/aegisub/src/bitmaps/windows/icon.ico b/src/bitmaps/windows/icon.ico
similarity index 100%
rename from aegisub/src/bitmaps/windows/icon.ico
rename to src/bitmaps/windows/icon.ico
diff --git a/aegisub/src/block_cache.h b/src/block_cache.h
similarity index 100%
rename from aegisub/src/block_cache.h
rename to src/block_cache.h
diff --git a/aegisub/src/charset_detect.cpp b/src/charset_detect.cpp
similarity index 100%
rename from aegisub/src/charset_detect.cpp
rename to src/charset_detect.cpp
diff --git a/aegisub/src/charset_detect.h b/src/charset_detect.h
similarity index 100%
rename from aegisub/src/charset_detect.h
rename to src/charset_detect.h
diff --git a/aegisub/src/colorspace.cpp b/src/colorspace.cpp
similarity index 100%
rename from aegisub/src/colorspace.cpp
rename to src/colorspace.cpp
diff --git a/aegisub/src/colorspace.h b/src/colorspace.h
similarity index 100%
rename from aegisub/src/colorspace.h
rename to src/colorspace.h
diff --git a/aegisub/src/colour_button.cpp b/src/colour_button.cpp
similarity index 100%
rename from aegisub/src/colour_button.cpp
rename to src/colour_button.cpp
diff --git a/aegisub/src/colour_button.h b/src/colour_button.h
similarity index 100%
rename from aegisub/src/colour_button.h
rename to src/colour_button.h
diff --git a/aegisub/src/command/Makefile.inc b/src/command/Makefile.inc
similarity index 100%
rename from aegisub/src/command/Makefile.inc
rename to src/command/Makefile.inc
diff --git a/aegisub/src/command/app.cpp b/src/command/app.cpp
similarity index 100%
rename from aegisub/src/command/app.cpp
rename to src/command/app.cpp
diff --git a/aegisub/src/command/audio.cpp b/src/command/audio.cpp
similarity index 100%
rename from aegisub/src/command/audio.cpp
rename to src/command/audio.cpp
diff --git a/aegisub/src/command/automation.cpp b/src/command/automation.cpp
similarity index 100%
rename from aegisub/src/command/automation.cpp
rename to src/command/automation.cpp
diff --git a/aegisub/src/command/command.cpp b/src/command/command.cpp
similarity index 100%
rename from aegisub/src/command/command.cpp
rename to src/command/command.cpp
diff --git a/aegisub/src/command/command.h b/src/command/command.h
similarity index 100%
rename from aegisub/src/command/command.h
rename to src/command/command.h
diff --git a/aegisub/src/command/edit.cpp b/src/command/edit.cpp
similarity index 100%
rename from aegisub/src/command/edit.cpp
rename to src/command/edit.cpp
diff --git a/aegisub/src/command/grid.cpp b/src/command/grid.cpp
similarity index 100%
rename from aegisub/src/command/grid.cpp
rename to src/command/grid.cpp
diff --git a/aegisub/src/command/help.cpp b/src/command/help.cpp
similarity index 100%
rename from aegisub/src/command/help.cpp
rename to src/command/help.cpp
diff --git a/aegisub/src/command/keyframe.cpp b/src/command/keyframe.cpp
similarity index 100%
rename from aegisub/src/command/keyframe.cpp
rename to src/command/keyframe.cpp
diff --git a/aegisub/src/command/recent.cpp b/src/command/recent.cpp
similarity index 100%
rename from aegisub/src/command/recent.cpp
rename to src/command/recent.cpp
diff --git a/aegisub/src/command/subtitle.cpp b/src/command/subtitle.cpp
similarity index 100%
rename from aegisub/src/command/subtitle.cpp
rename to src/command/subtitle.cpp
diff --git a/aegisub/src/command/time.cpp b/src/command/time.cpp
similarity index 100%
rename from aegisub/src/command/time.cpp
rename to src/command/time.cpp
diff --git a/aegisub/src/command/timecode.cpp b/src/command/timecode.cpp
similarity index 100%
rename from aegisub/src/command/timecode.cpp
rename to src/command/timecode.cpp
diff --git a/aegisub/src/command/tool.cpp b/src/command/tool.cpp
similarity index 100%
rename from aegisub/src/command/tool.cpp
rename to src/command/tool.cpp
diff --git a/aegisub/src/command/video.cpp b/src/command/video.cpp
similarity index 100%
rename from aegisub/src/command/video.cpp
rename to src/command/video.cpp
diff --git a/aegisub/src/command/vis_tool.cpp b/src/command/vis_tool.cpp
similarity index 100%
rename from aegisub/src/command/vis_tool.cpp
rename to src/command/vis_tool.cpp
diff --git a/aegisub/src/compat.cpp b/src/compat.cpp
similarity index 100%
rename from aegisub/src/compat.cpp
rename to src/compat.cpp
diff --git a/aegisub/src/compat.h b/src/compat.h
similarity index 100%
rename from aegisub/src/compat.h
rename to src/compat.h
diff --git a/aegisub/src/config.h b/src/config.h
similarity index 100%
rename from aegisub/src/config.h
rename to src/config.h
diff --git a/aegisub/src/dialog_about.cpp b/src/dialog_about.cpp
similarity index 100%
rename from aegisub/src/dialog_about.cpp
rename to src/dialog_about.cpp
diff --git a/aegisub/src/dialog_about.h b/src/dialog_about.h
similarity index 100%
rename from aegisub/src/dialog_about.h
rename to src/dialog_about.h
diff --git a/aegisub/src/dialog_attachments.cpp b/src/dialog_attachments.cpp
similarity index 100%
rename from aegisub/src/dialog_attachments.cpp
rename to src/dialog_attachments.cpp
diff --git a/aegisub/src/dialog_attachments.h b/src/dialog_attachments.h
similarity index 100%
rename from aegisub/src/dialog_attachments.h
rename to src/dialog_attachments.h
diff --git a/aegisub/src/dialog_automation.cpp b/src/dialog_automation.cpp
similarity index 100%
rename from aegisub/src/dialog_automation.cpp
rename to src/dialog_automation.cpp
diff --git a/aegisub/src/dialog_automation.h b/src/dialog_automation.h
similarity index 100%
rename from aegisub/src/dialog_automation.h
rename to src/dialog_automation.h
diff --git a/aegisub/src/dialog_autosave.cpp b/src/dialog_autosave.cpp
similarity index 100%
rename from aegisub/src/dialog_autosave.cpp
rename to src/dialog_autosave.cpp
diff --git a/aegisub/src/dialog_autosave.h b/src/dialog_autosave.h
similarity index 100%
rename from aegisub/src/dialog_autosave.h
rename to src/dialog_autosave.h
diff --git a/aegisub/src/dialog_colorpicker.cpp b/src/dialog_colorpicker.cpp
similarity index 100%
rename from aegisub/src/dialog_colorpicker.cpp
rename to src/dialog_colorpicker.cpp
diff --git a/aegisub/src/dialog_colorpicker.h b/src/dialog_colorpicker.h
similarity index 100%
rename from aegisub/src/dialog_colorpicker.h
rename to src/dialog_colorpicker.h
diff --git a/aegisub/src/dialog_detached_video.cpp b/src/dialog_detached_video.cpp
similarity index 100%
rename from aegisub/src/dialog_detached_video.cpp
rename to src/dialog_detached_video.cpp
diff --git a/aegisub/src/dialog_detached_video.h b/src/dialog_detached_video.h
similarity index 100%
rename from aegisub/src/dialog_detached_video.h
rename to src/dialog_detached_video.h
diff --git a/aegisub/src/dialog_dummy_video.cpp b/src/dialog_dummy_video.cpp
similarity index 100%
rename from aegisub/src/dialog_dummy_video.cpp
rename to src/dialog_dummy_video.cpp
diff --git a/aegisub/src/dialog_dummy_video.h b/src/dialog_dummy_video.h
similarity index 100%
rename from aegisub/src/dialog_dummy_video.h
rename to src/dialog_dummy_video.h
diff --git a/aegisub/src/dialog_export.cpp b/src/dialog_export.cpp
similarity index 100%
rename from aegisub/src/dialog_export.cpp
rename to src/dialog_export.cpp
diff --git a/aegisub/src/dialog_export.h b/src/dialog_export.h
similarity index 100%
rename from aegisub/src/dialog_export.h
rename to src/dialog_export.h
diff --git a/aegisub/src/dialog_export_ebu3264.cpp b/src/dialog_export_ebu3264.cpp
similarity index 100%
rename from aegisub/src/dialog_export_ebu3264.cpp
rename to src/dialog_export_ebu3264.cpp
diff --git a/aegisub/src/dialog_export_ebu3264.h b/src/dialog_export_ebu3264.h
similarity index 100%
rename from aegisub/src/dialog_export_ebu3264.h
rename to src/dialog_export_ebu3264.h
diff --git a/aegisub/src/dialog_fonts_collector.cpp b/src/dialog_fonts_collector.cpp
similarity index 100%
rename from aegisub/src/dialog_fonts_collector.cpp
rename to src/dialog_fonts_collector.cpp
diff --git a/aegisub/src/dialog_fonts_collector.h b/src/dialog_fonts_collector.h
similarity index 100%
rename from aegisub/src/dialog_fonts_collector.h
rename to src/dialog_fonts_collector.h
diff --git a/aegisub/src/dialog_jumpto.cpp b/src/dialog_jumpto.cpp
similarity index 100%
rename from aegisub/src/dialog_jumpto.cpp
rename to src/dialog_jumpto.cpp
diff --git a/aegisub/src/dialog_jumpto.h b/src/dialog_jumpto.h
similarity index 100%
rename from aegisub/src/dialog_jumpto.h
rename to src/dialog_jumpto.h
diff --git a/aegisub/src/dialog_kara_timing_copy.cpp b/src/dialog_kara_timing_copy.cpp
similarity index 100%
rename from aegisub/src/dialog_kara_timing_copy.cpp
rename to src/dialog_kara_timing_copy.cpp
diff --git a/aegisub/src/dialog_kara_timing_copy.h b/src/dialog_kara_timing_copy.h
similarity index 100%
rename from aegisub/src/dialog_kara_timing_copy.h
rename to src/dialog_kara_timing_copy.h
diff --git a/aegisub/src/dialog_log.cpp b/src/dialog_log.cpp
similarity index 100%
rename from aegisub/src/dialog_log.cpp
rename to src/dialog_log.cpp
diff --git a/aegisub/src/dialog_log.h b/src/dialog_log.h
similarity index 100%
rename from aegisub/src/dialog_log.h
rename to src/dialog_log.h
diff --git a/aegisub/src/dialog_manager.h b/src/dialog_manager.h
similarity index 100%
rename from aegisub/src/dialog_manager.h
rename to src/dialog_manager.h
diff --git a/aegisub/src/dialog_paste_over.cpp b/src/dialog_paste_over.cpp
similarity index 100%
rename from aegisub/src/dialog_paste_over.cpp
rename to src/dialog_paste_over.cpp
diff --git a/aegisub/src/dialog_paste_over.h b/src/dialog_paste_over.h
similarity index 100%
rename from aegisub/src/dialog_paste_over.h
rename to src/dialog_paste_over.h
diff --git a/aegisub/src/dialog_progress.cpp b/src/dialog_progress.cpp
similarity index 100%
rename from aegisub/src/dialog_progress.cpp
rename to src/dialog_progress.cpp
diff --git a/aegisub/src/dialog_progress.h b/src/dialog_progress.h
similarity index 100%
rename from aegisub/src/dialog_progress.h
rename to src/dialog_progress.h
diff --git a/aegisub/src/dialog_properties.cpp b/src/dialog_properties.cpp
similarity index 100%
rename from aegisub/src/dialog_properties.cpp
rename to src/dialog_properties.cpp
diff --git a/aegisub/src/dialog_properties.h b/src/dialog_properties.h
similarity index 100%
rename from aegisub/src/dialog_properties.h
rename to src/dialog_properties.h
diff --git a/aegisub/src/dialog_resample.cpp b/src/dialog_resample.cpp
similarity index 100%
rename from aegisub/src/dialog_resample.cpp
rename to src/dialog_resample.cpp
diff --git a/aegisub/src/dialog_resample.h b/src/dialog_resample.h
similarity index 100%
rename from aegisub/src/dialog_resample.h
rename to src/dialog_resample.h
diff --git a/aegisub/src/dialog_search_replace.cpp b/src/dialog_search_replace.cpp
similarity index 100%
rename from aegisub/src/dialog_search_replace.cpp
rename to src/dialog_search_replace.cpp
diff --git a/aegisub/src/dialog_search_replace.h b/src/dialog_search_replace.h
similarity index 100%
rename from aegisub/src/dialog_search_replace.h
rename to src/dialog_search_replace.h
diff --git a/aegisub/src/dialog_selected_choices.cpp b/src/dialog_selected_choices.cpp
similarity index 100%
rename from aegisub/src/dialog_selected_choices.cpp
rename to src/dialog_selected_choices.cpp
diff --git a/aegisub/src/dialog_selected_choices.h b/src/dialog_selected_choices.h
similarity index 100%
rename from aegisub/src/dialog_selected_choices.h
rename to src/dialog_selected_choices.h
diff --git a/aegisub/src/dialog_selection.cpp b/src/dialog_selection.cpp
similarity index 100%
rename from aegisub/src/dialog_selection.cpp
rename to src/dialog_selection.cpp
diff --git a/aegisub/src/dialog_selection.h b/src/dialog_selection.h
similarity index 100%
rename from aegisub/src/dialog_selection.h
rename to src/dialog_selection.h
diff --git a/aegisub/src/dialog_shift_times.cpp b/src/dialog_shift_times.cpp
similarity index 100%
rename from aegisub/src/dialog_shift_times.cpp
rename to src/dialog_shift_times.cpp
diff --git a/aegisub/src/dialog_shift_times.h b/src/dialog_shift_times.h
similarity index 100%
rename from aegisub/src/dialog_shift_times.h
rename to src/dialog_shift_times.h
diff --git a/aegisub/src/dialog_spellchecker.cpp b/src/dialog_spellchecker.cpp
similarity index 100%
rename from aegisub/src/dialog_spellchecker.cpp
rename to src/dialog_spellchecker.cpp
diff --git a/aegisub/src/dialog_spellchecker.h b/src/dialog_spellchecker.h
similarity index 100%
rename from aegisub/src/dialog_spellchecker.h
rename to src/dialog_spellchecker.h
diff --git a/aegisub/src/dialog_style_editor.cpp b/src/dialog_style_editor.cpp
similarity index 100%
rename from aegisub/src/dialog_style_editor.cpp
rename to src/dialog_style_editor.cpp
diff --git a/aegisub/src/dialog_style_editor.h b/src/dialog_style_editor.h
similarity index 100%
rename from aegisub/src/dialog_style_editor.h
rename to src/dialog_style_editor.h
diff --git a/aegisub/src/dialog_style_manager.cpp b/src/dialog_style_manager.cpp
similarity index 100%
rename from aegisub/src/dialog_style_manager.cpp
rename to src/dialog_style_manager.cpp
diff --git a/aegisub/src/dialog_style_manager.h b/src/dialog_style_manager.h
similarity index 100%
rename from aegisub/src/dialog_style_manager.h
rename to src/dialog_style_manager.h
diff --git a/aegisub/src/dialog_styling_assistant.cpp b/src/dialog_styling_assistant.cpp
similarity index 100%
rename from aegisub/src/dialog_styling_assistant.cpp
rename to src/dialog_styling_assistant.cpp
diff --git a/aegisub/src/dialog_styling_assistant.h b/src/dialog_styling_assistant.h
similarity index 100%
rename from aegisub/src/dialog_styling_assistant.h
rename to src/dialog_styling_assistant.h
diff --git a/aegisub/src/dialog_text_import.cpp b/src/dialog_text_import.cpp
similarity index 100%
rename from aegisub/src/dialog_text_import.cpp
rename to src/dialog_text_import.cpp
diff --git a/aegisub/src/dialog_text_import.h b/src/dialog_text_import.h
similarity index 100%
rename from aegisub/src/dialog_text_import.h
rename to src/dialog_text_import.h
diff --git a/aegisub/src/dialog_timing_processor.cpp b/src/dialog_timing_processor.cpp
similarity index 100%
rename from aegisub/src/dialog_timing_processor.cpp
rename to src/dialog_timing_processor.cpp
diff --git a/aegisub/src/dialog_timing_processor.h b/src/dialog_timing_processor.h
similarity index 100%
rename from aegisub/src/dialog_timing_processor.h
rename to src/dialog_timing_processor.h
diff --git a/aegisub/src/dialog_translation.cpp b/src/dialog_translation.cpp
similarity index 100%
rename from aegisub/src/dialog_translation.cpp
rename to src/dialog_translation.cpp
diff --git a/aegisub/src/dialog_translation.h b/src/dialog_translation.h
similarity index 100%
rename from aegisub/src/dialog_translation.h
rename to src/dialog_translation.h
diff --git a/aegisub/src/dialog_version_check.cpp b/src/dialog_version_check.cpp
similarity index 100%
rename from aegisub/src/dialog_version_check.cpp
rename to src/dialog_version_check.cpp
diff --git a/aegisub/src/dialog_version_check.h b/src/dialog_version_check.h
similarity index 100%
rename from aegisub/src/dialog_version_check.h
rename to src/dialog_version_check.h
diff --git a/aegisub/src/dialog_video_details.cpp b/src/dialog_video_details.cpp
similarity index 100%
rename from aegisub/src/dialog_video_details.cpp
rename to src/dialog_video_details.cpp
diff --git a/aegisub/src/dialog_video_details.h b/src/dialog_video_details.h
similarity index 100%
rename from aegisub/src/dialog_video_details.h
rename to src/dialog_video_details.h
diff --git a/aegisub/src/export_fixstyle.cpp b/src/export_fixstyle.cpp
similarity index 100%
rename from aegisub/src/export_fixstyle.cpp
rename to src/export_fixstyle.cpp
diff --git a/aegisub/src/export_fixstyle.h b/src/export_fixstyle.h
similarity index 100%
rename from aegisub/src/export_fixstyle.h
rename to src/export_fixstyle.h
diff --git a/aegisub/src/export_framerate.cpp b/src/export_framerate.cpp
similarity index 100%
rename from aegisub/src/export_framerate.cpp
rename to src/export_framerate.cpp
diff --git a/aegisub/src/export_framerate.h b/src/export_framerate.h
similarity index 100%
rename from aegisub/src/export_framerate.h
rename to src/export_framerate.h
diff --git a/aegisub/src/factory_manager.h b/src/factory_manager.h
similarity index 100%
rename from aegisub/src/factory_manager.h
rename to src/factory_manager.h
diff --git a/aegisub/src/ffmpegsource_common.cpp b/src/ffmpegsource_common.cpp
similarity index 100%
rename from aegisub/src/ffmpegsource_common.cpp
rename to src/ffmpegsource_common.cpp
diff --git a/aegisub/src/ffmpegsource_common.h b/src/ffmpegsource_common.h
similarity index 100%
rename from aegisub/src/ffmpegsource_common.h
rename to src/ffmpegsource_common.h
diff --git a/aegisub/src/fft.cpp b/src/fft.cpp
similarity index 100%
rename from aegisub/src/fft.cpp
rename to src/fft.cpp
diff --git a/aegisub/src/fft.h b/src/fft.h
similarity index 100%
rename from aegisub/src/fft.h
rename to src/fft.h
diff --git a/aegisub/src/font_file_lister.cpp b/src/font_file_lister.cpp
similarity index 100%
rename from aegisub/src/font_file_lister.cpp
rename to src/font_file_lister.cpp
diff --git a/aegisub/src/font_file_lister.h b/src/font_file_lister.h
similarity index 100%
rename from aegisub/src/font_file_lister.h
rename to src/font_file_lister.h
diff --git a/aegisub/src/font_file_lister_fontconfig.cpp b/src/font_file_lister_fontconfig.cpp
similarity index 100%
rename from aegisub/src/font_file_lister_fontconfig.cpp
rename to src/font_file_lister_fontconfig.cpp
diff --git a/aegisub/src/font_file_lister_fontconfig.h b/src/font_file_lister_fontconfig.h
similarity index 100%
rename from aegisub/src/font_file_lister_fontconfig.h
rename to src/font_file_lister_fontconfig.h
diff --git a/aegisub/src/frame_main.cpp b/src/frame_main.cpp
similarity index 100%
rename from aegisub/src/frame_main.cpp
rename to src/frame_main.cpp
diff --git a/aegisub/src/frame_main.h b/src/frame_main.h
similarity index 100%
rename from aegisub/src/frame_main.h
rename to src/frame_main.h
diff --git a/aegisub/src/gl/glext.h b/src/gl/glext.h
similarity index 100%
rename from aegisub/src/gl/glext.h
rename to src/gl/glext.h
diff --git a/aegisub/src/gl_text.cpp b/src/gl_text.cpp
similarity index 100%
rename from aegisub/src/gl_text.cpp
rename to src/gl_text.cpp
diff --git a/aegisub/src/gl_text.h b/src/gl_text.h
similarity index 100%
rename from aegisub/src/gl_text.h
rename to src/gl_text.h
diff --git a/aegisub/src/gl_wrap.cpp b/src/gl_wrap.cpp
similarity index 100%
rename from aegisub/src/gl_wrap.cpp
rename to src/gl_wrap.cpp
diff --git a/aegisub/src/gl_wrap.h b/src/gl_wrap.h
similarity index 100%
rename from aegisub/src/gl_wrap.h
rename to src/gl_wrap.h
diff --git a/aegisub/src/help_button.cpp b/src/help_button.cpp
similarity index 100%
rename from aegisub/src/help_button.cpp
rename to src/help_button.cpp
diff --git a/aegisub/src/help_button.h b/src/help_button.h
similarity index 100%
rename from aegisub/src/help_button.h
rename to src/help_button.h
diff --git a/aegisub/src/hotkey.cpp b/src/hotkey.cpp
similarity index 100%
rename from aegisub/src/hotkey.cpp
rename to src/hotkey.cpp
diff --git a/aegisub/src/hotkey_data_view_model.cpp b/src/hotkey_data_view_model.cpp
similarity index 100%
rename from aegisub/src/hotkey_data_view_model.cpp
rename to src/hotkey_data_view_model.cpp
diff --git a/aegisub/src/hotkey_data_view_model.h b/src/hotkey_data_view_model.h
similarity index 100%
rename from aegisub/src/hotkey_data_view_model.h
rename to src/hotkey_data_view_model.h
diff --git a/aegisub/src/include/aegisub/audio_player.h b/src/include/aegisub/audio_player.h
similarity index 100%
rename from aegisub/src/include/aegisub/audio_player.h
rename to src/include/aegisub/audio_player.h
diff --git a/aegisub/src/include/aegisub/audio_provider.h b/src/include/aegisub/audio_provider.h
similarity index 100%
rename from aegisub/src/include/aegisub/audio_provider.h
rename to src/include/aegisub/audio_provider.h
diff --git a/aegisub/src/include/aegisub/context.h b/src/include/aegisub/context.h
similarity index 100%
rename from aegisub/src/include/aegisub/context.h
rename to src/include/aegisub/context.h
diff --git a/aegisub/src/include/aegisub/hotkey.h b/src/include/aegisub/hotkey.h
similarity index 100%
rename from aegisub/src/include/aegisub/hotkey.h
rename to src/include/aegisub/hotkey.h
diff --git a/aegisub/src/include/aegisub/menu.h b/src/include/aegisub/menu.h
similarity index 100%
rename from aegisub/src/include/aegisub/menu.h
rename to src/include/aegisub/menu.h
diff --git a/aegisub/src/include/aegisub/spellchecker.h b/src/include/aegisub/spellchecker.h
similarity index 100%
rename from aegisub/src/include/aegisub/spellchecker.h
rename to src/include/aegisub/spellchecker.h
diff --git a/aegisub/src/include/aegisub/subtitles_provider.h b/src/include/aegisub/subtitles_provider.h
similarity index 100%
rename from aegisub/src/include/aegisub/subtitles_provider.h
rename to src/include/aegisub/subtitles_provider.h
diff --git a/aegisub/src/include/aegisub/toolbar.h b/src/include/aegisub/toolbar.h
similarity index 100%
rename from aegisub/src/include/aegisub/toolbar.h
rename to src/include/aegisub/toolbar.h
diff --git a/aegisub/src/include/aegisub/video_provider.h b/src/include/aegisub/video_provider.h
similarity index 100%
rename from aegisub/src/include/aegisub/video_provider.h
rename to src/include/aegisub/video_provider.h
diff --git a/aegisub/src/initial_line_state.cpp b/src/initial_line_state.cpp
similarity index 100%
rename from aegisub/src/initial_line_state.cpp
rename to src/initial_line_state.cpp
diff --git a/aegisub/src/initial_line_state.h b/src/initial_line_state.h
similarity index 100%
rename from aegisub/src/initial_line_state.h
rename to src/initial_line_state.h
diff --git a/aegisub/src/libresrc/Makefile.inc b/src/libresrc/Makefile.inc
similarity index 100%
rename from aegisub/src/libresrc/Makefile.inc
rename to src/libresrc/Makefile.inc
diff --git a/aegisub/src/libresrc/default_config.json b/src/libresrc/default_config.json
similarity index 100%
rename from aegisub/src/libresrc/default_config.json
rename to src/libresrc/default_config.json
diff --git a/aegisub/src/libresrc/default_config_platform.json.in b/src/libresrc/default_config_platform.json.in
similarity index 100%
rename from aegisub/src/libresrc/default_config_platform.json.in
rename to src/libresrc/default_config_platform.json.in
diff --git a/aegisub/src/libresrc/default_config_win.json b/src/libresrc/default_config_win.json
similarity index 100%
rename from aegisub/src/libresrc/default_config_win.json
rename to src/libresrc/default_config_win.json
diff --git a/aegisub/src/libresrc/default_hotkey.json b/src/libresrc/default_hotkey.json
similarity index 100%
rename from aegisub/src/libresrc/default_hotkey.json
rename to src/libresrc/default_hotkey.json
diff --git a/aegisub/src/libresrc/default_menu.json b/src/libresrc/default_menu.json
similarity index 100%
rename from aegisub/src/libresrc/default_menu.json
rename to src/libresrc/default_menu.json
diff --git a/aegisub/src/libresrc/default_mru.json b/src/libresrc/default_mru.json
similarity index 100%
rename from aegisub/src/libresrc/default_mru.json
rename to src/libresrc/default_mru.json
diff --git a/aegisub/src/libresrc/default_path.json b/src/libresrc/default_path.json
similarity index 100%
rename from aegisub/src/libresrc/default_path.json
rename to src/libresrc/default_path.json
diff --git a/aegisub/src/libresrc/default_toolbar.json b/src/libresrc/default_toolbar.json
similarity index 100%
rename from aegisub/src/libresrc/default_toolbar.json
rename to src/libresrc/default_toolbar.json
diff --git a/aegisub/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp
similarity index 100%
rename from aegisub/src/libresrc/libresrc.cpp
rename to src/libresrc/libresrc.cpp
diff --git a/aegisub/src/libresrc/libresrc.h b/src/libresrc/libresrc.h
similarity index 100%
rename from aegisub/src/libresrc/libresrc.h
rename to src/libresrc/libresrc.h
diff --git a/aegisub/src/libresrc/manifest.respack b/src/libresrc/manifest.respack
similarity index 100%
rename from aegisub/src/libresrc/manifest.respack
rename to src/libresrc/manifest.respack
diff --git a/aegisub/src/libresrc/manifest_osx.respack b/src/libresrc/manifest_osx.respack
similarity index 100%
rename from aegisub/src/libresrc/manifest_osx.respack
rename to src/libresrc/manifest_osx.respack
diff --git a/aegisub/src/libresrc/osx/default_config.json b/src/libresrc/osx/default_config.json
similarity index 100%
rename from aegisub/src/libresrc/osx/default_config.json
rename to src/libresrc/osx/default_config.json
diff --git a/aegisub/src/libresrc/osx/default_hotkey.json b/src/libresrc/osx/default_hotkey.json
similarity index 100%
rename from aegisub/src/libresrc/osx/default_hotkey.json
rename to src/libresrc/osx/default_hotkey.json
diff --git a/aegisub/src/libresrc/osx/default_menu.json b/src/libresrc/osx/default_menu.json
similarity index 100%
rename from aegisub/src/libresrc/osx/default_menu.json
rename to src/libresrc/osx/default_menu.json
diff --git a/aegisub/src/lpeg.c b/src/lpeg.c
similarity index 100%
rename from aegisub/src/lpeg.c
rename to src/lpeg.c
diff --git a/aegisub/src/lpeg.h b/src/lpeg.h
similarity index 100%
rename from aegisub/src/lpeg.h
rename to src/lpeg.h
diff --git a/aegisub/src/main.cpp b/src/main.cpp
similarity index 100%
rename from aegisub/src/main.cpp
rename to src/main.cpp
diff --git a/aegisub/src/main.h b/src/main.h
similarity index 100%
rename from aegisub/src/main.h
rename to src/main.h
diff --git a/aegisub/src/menu.cpp b/src/menu.cpp
similarity index 100%
rename from aegisub/src/menu.cpp
rename to src/menu.cpp
diff --git a/aegisub/src/mkv_wrap.cpp b/src/mkv_wrap.cpp
similarity index 100%
rename from aegisub/src/mkv_wrap.cpp
rename to src/mkv_wrap.cpp
diff --git a/aegisub/src/mkv_wrap.h b/src/mkv_wrap.h
similarity index 100%
rename from aegisub/src/mkv_wrap.h
rename to src/mkv_wrap.h
diff --git a/aegisub/src/msvc/inttypes.h b/src/msvc/inttypes.h
similarity index 100%
rename from aegisub/src/msvc/inttypes.h
rename to src/msvc/inttypes.h
diff --git a/aegisub/src/options.h b/src/options.h
similarity index 100%
rename from aegisub/src/options.h
rename to src/options.h
diff --git a/aegisub/src/osx-run.sh b/src/osx-run.sh
similarity index 100%
rename from aegisub/src/osx-run.sh
rename to src/osx-run.sh
diff --git a/aegisub/src/osx_utils.mm b/src/osx_utils.mm
similarity index 100%
rename from aegisub/src/osx_utils.mm
rename to src/osx_utils.mm
diff --git a/aegisub/src/pen.cpp b/src/pen.cpp
similarity index 100%
rename from aegisub/src/pen.cpp
rename to src/pen.cpp
diff --git a/aegisub/src/pen.h b/src/pen.h
similarity index 100%
rename from aegisub/src/pen.h
rename to src/pen.h
diff --git a/aegisub/src/persist_location.cpp b/src/persist_location.cpp
similarity index 100%
rename from aegisub/src/persist_location.cpp
rename to src/persist_location.cpp
diff --git a/aegisub/src/persist_location.h b/src/persist_location.h
similarity index 100%
rename from aegisub/src/persist_location.h
rename to src/persist_location.h
diff --git a/aegisub/src/placeholder_ctrl.h b/src/placeholder_ctrl.h
similarity index 100%
rename from aegisub/src/placeholder_ctrl.h
rename to src/placeholder_ctrl.h
diff --git a/aegisub/src/plugin_manager.cpp b/src/plugin_manager.cpp
similarity index 100%
rename from aegisub/src/plugin_manager.cpp
rename to src/plugin_manager.cpp
diff --git a/aegisub/src/plugin_manager.h b/src/plugin_manager.h
similarity index 100%
rename from aegisub/src/plugin_manager.h
rename to src/plugin_manager.h
diff --git a/aegisub/src/preferences.cpp b/src/preferences.cpp
similarity index 100%
rename from aegisub/src/preferences.cpp
rename to src/preferences.cpp
diff --git a/aegisub/src/preferences.h b/src/preferences.h
similarity index 100%
rename from aegisub/src/preferences.h
rename to src/preferences.h
diff --git a/aegisub/src/preferences_base.cpp b/src/preferences_base.cpp
similarity index 100%
rename from aegisub/src/preferences_base.cpp
rename to src/preferences_base.cpp
diff --git a/aegisub/src/preferences_base.h b/src/preferences_base.h
similarity index 100%
rename from aegisub/src/preferences_base.h
rename to src/preferences_base.h
diff --git a/aegisub/src/res/res.rc b/src/res/res.rc
similarity index 100%
rename from aegisub/src/res/res.rc
rename to src/res/res.rc
diff --git a/aegisub/src/res/strings.rc b/src/res/strings.rc
similarity index 100%
rename from aegisub/src/res/strings.rc
rename to src/res/strings.rc
diff --git a/aegisub/src/res/strings_utf8.rc b/src/res/strings_utf8.rc
similarity index 100%
rename from aegisub/src/res/strings_utf8.rc
rename to src/res/strings_utf8.rc
diff --git a/aegisub/src/resolution_resampler.cpp b/src/resolution_resampler.cpp
similarity index 100%
rename from aegisub/src/resolution_resampler.cpp
rename to src/resolution_resampler.cpp
diff --git a/aegisub/src/resolution_resampler.h b/src/resolution_resampler.h
similarity index 100%
rename from aegisub/src/resolution_resampler.h
rename to src/resolution_resampler.h
diff --git a/aegisub/src/retina_helper.h b/src/retina_helper.h
similarity index 100%
rename from aegisub/src/retina_helper.h
rename to src/retina_helper.h
diff --git a/aegisub/src/retina_helper.mm b/src/retina_helper.mm
similarity index 100%
rename from aegisub/src/retina_helper.mm
rename to src/retina_helper.mm
diff --git a/aegisub/src/scintilla_text_ctrl.cpp b/src/scintilla_text_ctrl.cpp
similarity index 100%
rename from aegisub/src/scintilla_text_ctrl.cpp
rename to src/scintilla_text_ctrl.cpp
diff --git a/aegisub/src/scintilla_text_ctrl.h b/src/scintilla_text_ctrl.h
similarity index 100%
rename from aegisub/src/scintilla_text_ctrl.h
rename to src/scintilla_text_ctrl.h
diff --git a/aegisub/src/scintilla_text_selection_controller.cpp b/src/scintilla_text_selection_controller.cpp
similarity index 100%
rename from aegisub/src/scintilla_text_selection_controller.cpp
rename to src/scintilla_text_selection_controller.cpp
diff --git a/aegisub/src/scintilla_text_selection_controller.h b/src/scintilla_text_selection_controller.h
similarity index 100%
rename from aegisub/src/scintilla_text_selection_controller.h
rename to src/scintilla_text_selection_controller.h
diff --git a/aegisub/src/search_replace_engine.cpp b/src/search_replace_engine.cpp
similarity index 100%
rename from aegisub/src/search_replace_engine.cpp
rename to src/search_replace_engine.cpp
diff --git a/aegisub/src/search_replace_engine.h b/src/search_replace_engine.h
similarity index 100%
rename from aegisub/src/search_replace_engine.h
rename to src/search_replace_engine.h
diff --git a/aegisub/src/selection_controller.h b/src/selection_controller.h
similarity index 100%
rename from aegisub/src/selection_controller.h
rename to src/selection_controller.h
diff --git a/aegisub/src/spellchecker.cpp b/src/spellchecker.cpp
similarity index 100%
rename from aegisub/src/spellchecker.cpp
rename to src/spellchecker.cpp
diff --git a/aegisub/src/spellchecker_hunspell.cpp b/src/spellchecker_hunspell.cpp
similarity index 100%
rename from aegisub/src/spellchecker_hunspell.cpp
rename to src/spellchecker_hunspell.cpp
diff --git a/aegisub/src/spellchecker_hunspell.h b/src/spellchecker_hunspell.h
similarity index 100%
rename from aegisub/src/spellchecker_hunspell.h
rename to src/spellchecker_hunspell.h
diff --git a/aegisub/src/spline.cpp b/src/spline.cpp
similarity index 100%
rename from aegisub/src/spline.cpp
rename to src/spline.cpp
diff --git a/aegisub/src/spline.h b/src/spline.h
similarity index 100%
rename from aegisub/src/spline.h
rename to src/spline.h
diff --git a/aegisub/src/spline_curve.cpp b/src/spline_curve.cpp
similarity index 100%
rename from aegisub/src/spline_curve.cpp
rename to src/spline_curve.cpp
diff --git a/aegisub/src/spline_curve.h b/src/spline_curve.h
similarity index 100%
rename from aegisub/src/spline_curve.h
rename to src/spline_curve.h
diff --git a/aegisub/src/string_codec.cpp b/src/string_codec.cpp
similarity index 100%
rename from aegisub/src/string_codec.cpp
rename to src/string_codec.cpp
diff --git a/aegisub/src/string_codec.h b/src/string_codec.h
similarity index 100%
rename from aegisub/src/string_codec.h
rename to src/string_codec.h
diff --git a/aegisub/src/subs_controller.cpp b/src/subs_controller.cpp
similarity index 100%
rename from aegisub/src/subs_controller.cpp
rename to src/subs_controller.cpp
diff --git a/aegisub/src/subs_controller.h b/src/subs_controller.h
similarity index 100%
rename from aegisub/src/subs_controller.h
rename to src/subs_controller.h
diff --git a/aegisub/src/subs_edit_box.cpp b/src/subs_edit_box.cpp
similarity index 100%
rename from aegisub/src/subs_edit_box.cpp
rename to src/subs_edit_box.cpp
diff --git a/aegisub/src/subs_edit_box.h b/src/subs_edit_box.h
similarity index 100%
rename from aegisub/src/subs_edit_box.h
rename to src/subs_edit_box.h
diff --git a/aegisub/src/subs_edit_ctrl.cpp b/src/subs_edit_ctrl.cpp
similarity index 100%
rename from aegisub/src/subs_edit_ctrl.cpp
rename to src/subs_edit_ctrl.cpp
diff --git a/aegisub/src/subs_edit_ctrl.h b/src/subs_edit_ctrl.h
similarity index 100%
rename from aegisub/src/subs_edit_ctrl.h
rename to src/subs_edit_ctrl.h
diff --git a/aegisub/src/subs_preview.cpp b/src/subs_preview.cpp
similarity index 100%
rename from aegisub/src/subs_preview.cpp
rename to src/subs_preview.cpp
diff --git a/aegisub/src/subs_preview.h b/src/subs_preview.h
similarity index 100%
rename from aegisub/src/subs_preview.h
rename to src/subs_preview.h
diff --git a/aegisub/src/subtitle_format.cpp b/src/subtitle_format.cpp
similarity index 100%
rename from aegisub/src/subtitle_format.cpp
rename to src/subtitle_format.cpp
diff --git a/aegisub/src/subtitle_format.h b/src/subtitle_format.h
similarity index 100%
rename from aegisub/src/subtitle_format.h
rename to src/subtitle_format.h
diff --git a/aegisub/src/subtitle_format_ass.cpp b/src/subtitle_format_ass.cpp
similarity index 100%
rename from aegisub/src/subtitle_format_ass.cpp
rename to src/subtitle_format_ass.cpp
diff --git a/aegisub/src/subtitle_format_ass.h b/src/subtitle_format_ass.h
similarity index 100%
rename from aegisub/src/subtitle_format_ass.h
rename to src/subtitle_format_ass.h
diff --git a/aegisub/src/subtitle_format_ebu3264.cpp b/src/subtitle_format_ebu3264.cpp
similarity index 100%
rename from aegisub/src/subtitle_format_ebu3264.cpp
rename to src/subtitle_format_ebu3264.cpp
diff --git a/aegisub/src/subtitle_format_ebu3264.h b/src/subtitle_format_ebu3264.h
similarity index 100%
rename from aegisub/src/subtitle_format_ebu3264.h
rename to src/subtitle_format_ebu3264.h
diff --git a/aegisub/src/subtitle_format_encore.cpp b/src/subtitle_format_encore.cpp
similarity index 100%
rename from aegisub/src/subtitle_format_encore.cpp
rename to src/subtitle_format_encore.cpp
diff --git a/aegisub/src/subtitle_format_encore.h b/src/subtitle_format_encore.h
similarity index 100%
rename from aegisub/src/subtitle_format_encore.h
rename to src/subtitle_format_encore.h
diff --git a/aegisub/src/subtitle_format_microdvd.cpp b/src/subtitle_format_microdvd.cpp
similarity index 100%
rename from aegisub/src/subtitle_format_microdvd.cpp
rename to src/subtitle_format_microdvd.cpp
diff --git a/aegisub/src/subtitle_format_microdvd.h b/src/subtitle_format_microdvd.h
similarity index 100%
rename from aegisub/src/subtitle_format_microdvd.h
rename to src/subtitle_format_microdvd.h
diff --git a/aegisub/src/subtitle_format_mkv.cpp b/src/subtitle_format_mkv.cpp
similarity index 100%
rename from aegisub/src/subtitle_format_mkv.cpp
rename to src/subtitle_format_mkv.cpp
diff --git a/aegisub/src/subtitle_format_mkv.h b/src/subtitle_format_mkv.h
similarity index 100%
rename from aegisub/src/subtitle_format_mkv.h
rename to src/subtitle_format_mkv.h
diff --git a/aegisub/src/subtitle_format_srt.cpp b/src/subtitle_format_srt.cpp
similarity index 100%
rename from aegisub/src/subtitle_format_srt.cpp
rename to src/subtitle_format_srt.cpp
diff --git a/aegisub/src/subtitle_format_srt.h b/src/subtitle_format_srt.h
similarity index 100%
rename from aegisub/src/subtitle_format_srt.h
rename to src/subtitle_format_srt.h
diff --git a/aegisub/src/subtitle_format_transtation.cpp b/src/subtitle_format_transtation.cpp
similarity index 100%
rename from aegisub/src/subtitle_format_transtation.cpp
rename to src/subtitle_format_transtation.cpp
diff --git a/aegisub/src/subtitle_format_transtation.h b/src/subtitle_format_transtation.h
similarity index 100%
rename from aegisub/src/subtitle_format_transtation.h
rename to src/subtitle_format_transtation.h
diff --git a/aegisub/src/subtitle_format_ttxt.cpp b/src/subtitle_format_ttxt.cpp
similarity index 100%
rename from aegisub/src/subtitle_format_ttxt.cpp
rename to src/subtitle_format_ttxt.cpp
diff --git a/aegisub/src/subtitle_format_ttxt.h b/src/subtitle_format_ttxt.h
similarity index 100%
rename from aegisub/src/subtitle_format_ttxt.h
rename to src/subtitle_format_ttxt.h
diff --git a/aegisub/src/subtitle_format_txt.cpp b/src/subtitle_format_txt.cpp
similarity index 100%
rename from aegisub/src/subtitle_format_txt.cpp
rename to src/subtitle_format_txt.cpp
diff --git a/aegisub/src/subtitle_format_txt.h b/src/subtitle_format_txt.h
similarity index 100%
rename from aegisub/src/subtitle_format_txt.h
rename to src/subtitle_format_txt.h
diff --git a/aegisub/src/subtitles_provider.cpp b/src/subtitles_provider.cpp
similarity index 100%
rename from aegisub/src/subtitles_provider.cpp
rename to src/subtitles_provider.cpp
diff --git a/aegisub/src/subtitles_provider_csri.cpp b/src/subtitles_provider_csri.cpp
similarity index 100%
rename from aegisub/src/subtitles_provider_csri.cpp
rename to src/subtitles_provider_csri.cpp
diff --git a/aegisub/src/subtitles_provider_csri.h b/src/subtitles_provider_csri.h
similarity index 100%
rename from aegisub/src/subtitles_provider_csri.h
rename to src/subtitles_provider_csri.h
diff --git a/aegisub/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
similarity index 100%
rename from aegisub/src/subtitles_provider_libass.cpp
rename to src/subtitles_provider_libass.cpp
diff --git a/aegisub/src/subtitles_provider_libass.h b/src/subtitles_provider_libass.h
similarity index 100%
rename from aegisub/src/subtitles_provider_libass.h
rename to src/subtitles_provider_libass.h
diff --git a/aegisub/src/text_file_reader.cpp b/src/text_file_reader.cpp
similarity index 100%
rename from aegisub/src/text_file_reader.cpp
rename to src/text_file_reader.cpp
diff --git a/aegisub/src/text_file_reader.h b/src/text_file_reader.h
similarity index 100%
rename from aegisub/src/text_file_reader.h
rename to src/text_file_reader.h
diff --git a/aegisub/src/text_file_writer.cpp b/src/text_file_writer.cpp
similarity index 100%
rename from aegisub/src/text_file_writer.cpp
rename to src/text_file_writer.cpp
diff --git a/aegisub/src/text_file_writer.h b/src/text_file_writer.h
similarity index 100%
rename from aegisub/src/text_file_writer.h
rename to src/text_file_writer.h
diff --git a/aegisub/src/text_selection_controller.h b/src/text_selection_controller.h
similarity index 100%
rename from aegisub/src/text_selection_controller.h
rename to src/text_selection_controller.h
diff --git a/aegisub/src/thesaurus.cpp b/src/thesaurus.cpp
similarity index 100%
rename from aegisub/src/thesaurus.cpp
rename to src/thesaurus.cpp
diff --git a/aegisub/src/thesaurus.h b/src/thesaurus.h
similarity index 100%
rename from aegisub/src/thesaurus.h
rename to src/thesaurus.h
diff --git a/aegisub/src/threaded_frame_source.cpp b/src/threaded_frame_source.cpp
similarity index 100%
rename from aegisub/src/threaded_frame_source.cpp
rename to src/threaded_frame_source.cpp
diff --git a/aegisub/src/threaded_frame_source.h b/src/threaded_frame_source.h
similarity index 100%
rename from aegisub/src/threaded_frame_source.h
rename to src/threaded_frame_source.h
diff --git a/aegisub/src/time_range.h b/src/time_range.h
similarity index 100%
rename from aegisub/src/time_range.h
rename to src/time_range.h
diff --git a/aegisub/src/timeedit_ctrl.cpp b/src/timeedit_ctrl.cpp
similarity index 100%
rename from aegisub/src/timeedit_ctrl.cpp
rename to src/timeedit_ctrl.cpp
diff --git a/aegisub/src/timeedit_ctrl.h b/src/timeedit_ctrl.h
similarity index 100%
rename from aegisub/src/timeedit_ctrl.h
rename to src/timeedit_ctrl.h
diff --git a/aegisub/src/toggle_bitmap.cpp b/src/toggle_bitmap.cpp
similarity index 100%
rename from aegisub/src/toggle_bitmap.cpp
rename to src/toggle_bitmap.cpp
diff --git a/aegisub/src/toggle_bitmap.h b/src/toggle_bitmap.h
similarity index 100%
rename from aegisub/src/toggle_bitmap.h
rename to src/toggle_bitmap.h
diff --git a/aegisub/src/toolbar.cpp b/src/toolbar.cpp
similarity index 100%
rename from aegisub/src/toolbar.cpp
rename to src/toolbar.cpp
diff --git a/aegisub/src/tooltip_manager.cpp b/src/tooltip_manager.cpp
similarity index 100%
rename from aegisub/src/tooltip_manager.cpp
rename to src/tooltip_manager.cpp
diff --git a/aegisub/src/tooltip_manager.h b/src/tooltip_manager.h
similarity index 100%
rename from aegisub/src/tooltip_manager.h
rename to src/tooltip_manager.h
diff --git a/aegisub/src/utils.cpp b/src/utils.cpp
similarity index 100%
rename from aegisub/src/utils.cpp
rename to src/utils.cpp
diff --git a/aegisub/src/utils.h b/src/utils.h
similarity index 100%
rename from aegisub/src/utils.h
rename to src/utils.h
diff --git a/aegisub/src/validators.cpp b/src/validators.cpp
similarity index 100%
rename from aegisub/src/validators.cpp
rename to src/validators.cpp
diff --git a/aegisub/src/validators.h b/src/validators.h
similarity index 100%
rename from aegisub/src/validators.h
rename to src/validators.h
diff --git a/aegisub/src/vector2d.cpp b/src/vector2d.cpp
similarity index 100%
rename from aegisub/src/vector2d.cpp
rename to src/vector2d.cpp
diff --git a/aegisub/src/vector2d.h b/src/vector2d.h
similarity index 100%
rename from aegisub/src/vector2d.h
rename to src/vector2d.h
diff --git a/aegisub/src/version.cpp b/src/version.cpp
similarity index 100%
rename from aegisub/src/version.cpp
rename to src/version.cpp
diff --git a/aegisub/src/version.h b/src/version.h
similarity index 100%
rename from aegisub/src/version.h
rename to src/version.h
diff --git a/aegisub/src/video_box.cpp b/src/video_box.cpp
similarity index 100%
rename from aegisub/src/video_box.cpp
rename to src/video_box.cpp
diff --git a/aegisub/src/video_box.h b/src/video_box.h
similarity index 100%
rename from aegisub/src/video_box.h
rename to src/video_box.h
diff --git a/aegisub/src/video_context.cpp b/src/video_context.cpp
similarity index 100%
rename from aegisub/src/video_context.cpp
rename to src/video_context.cpp
diff --git a/aegisub/src/video_context.h b/src/video_context.h
similarity index 100%
rename from aegisub/src/video_context.h
rename to src/video_context.h
diff --git a/aegisub/src/video_display.cpp b/src/video_display.cpp
similarity index 100%
rename from aegisub/src/video_display.cpp
rename to src/video_display.cpp
diff --git a/aegisub/src/video_display.h b/src/video_display.h
similarity index 100%
rename from aegisub/src/video_display.h
rename to src/video_display.h
diff --git a/aegisub/src/video_frame.cpp b/src/video_frame.cpp
similarity index 100%
rename from aegisub/src/video_frame.cpp
rename to src/video_frame.cpp
diff --git a/aegisub/src/video_frame.h b/src/video_frame.h
similarity index 100%
rename from aegisub/src/video_frame.h
rename to src/video_frame.h
diff --git a/aegisub/src/video_out_gl.cpp b/src/video_out_gl.cpp
similarity index 100%
rename from aegisub/src/video_out_gl.cpp
rename to src/video_out_gl.cpp
diff --git a/aegisub/src/video_out_gl.h b/src/video_out_gl.h
similarity index 100%
rename from aegisub/src/video_out_gl.h
rename to src/video_out_gl.h
diff --git a/aegisub/src/video_provider_avs.cpp b/src/video_provider_avs.cpp
similarity index 100%
rename from aegisub/src/video_provider_avs.cpp
rename to src/video_provider_avs.cpp
diff --git a/aegisub/src/video_provider_avs.h b/src/video_provider_avs.h
similarity index 100%
rename from aegisub/src/video_provider_avs.h
rename to src/video_provider_avs.h
diff --git a/aegisub/src/video_provider_cache.cpp b/src/video_provider_cache.cpp
similarity index 100%
rename from aegisub/src/video_provider_cache.cpp
rename to src/video_provider_cache.cpp
diff --git a/aegisub/src/video_provider_cache.h b/src/video_provider_cache.h
similarity index 100%
rename from aegisub/src/video_provider_cache.h
rename to src/video_provider_cache.h
diff --git a/aegisub/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
similarity index 100%
rename from aegisub/src/video_provider_dummy.cpp
rename to src/video_provider_dummy.cpp
diff --git a/aegisub/src/video_provider_dummy.h b/src/video_provider_dummy.h
similarity index 100%
rename from aegisub/src/video_provider_dummy.h
rename to src/video_provider_dummy.h
diff --git a/aegisub/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp
similarity index 100%
rename from aegisub/src/video_provider_ffmpegsource.cpp
rename to src/video_provider_ffmpegsource.cpp
diff --git a/aegisub/src/video_provider_ffmpegsource.h b/src/video_provider_ffmpegsource.h
similarity index 100%
rename from aegisub/src/video_provider_ffmpegsource.h
rename to src/video_provider_ffmpegsource.h
diff --git a/aegisub/src/video_provider_manager.cpp b/src/video_provider_manager.cpp
similarity index 100%
rename from aegisub/src/video_provider_manager.cpp
rename to src/video_provider_manager.cpp
diff --git a/aegisub/src/video_provider_manager.h b/src/video_provider_manager.h
similarity index 100%
rename from aegisub/src/video_provider_manager.h
rename to src/video_provider_manager.h
diff --git a/aegisub/src/video_provider_yuv4mpeg.cpp b/src/video_provider_yuv4mpeg.cpp
similarity index 100%
rename from aegisub/src/video_provider_yuv4mpeg.cpp
rename to src/video_provider_yuv4mpeg.cpp
diff --git a/aegisub/src/video_provider_yuv4mpeg.h b/src/video_provider_yuv4mpeg.h
similarity index 100%
rename from aegisub/src/video_provider_yuv4mpeg.h
rename to src/video_provider_yuv4mpeg.h
diff --git a/aegisub/src/video_slider.cpp b/src/video_slider.cpp
similarity index 100%
rename from aegisub/src/video_slider.cpp
rename to src/video_slider.cpp
diff --git a/aegisub/src/video_slider.h b/src/video_slider.h
similarity index 100%
rename from aegisub/src/video_slider.h
rename to src/video_slider.h
diff --git a/aegisub/src/visual_feature.cpp b/src/visual_feature.cpp
similarity index 100%
rename from aegisub/src/visual_feature.cpp
rename to src/visual_feature.cpp
diff --git a/aegisub/src/visual_feature.h b/src/visual_feature.h
similarity index 100%
rename from aegisub/src/visual_feature.h
rename to src/visual_feature.h
diff --git a/aegisub/src/visual_tool.cpp b/src/visual_tool.cpp
similarity index 100%
rename from aegisub/src/visual_tool.cpp
rename to src/visual_tool.cpp
diff --git a/aegisub/src/visual_tool.h b/src/visual_tool.h
similarity index 100%
rename from aegisub/src/visual_tool.h
rename to src/visual_tool.h
diff --git a/aegisub/src/visual_tool_clip.cpp b/src/visual_tool_clip.cpp
similarity index 100%
rename from aegisub/src/visual_tool_clip.cpp
rename to src/visual_tool_clip.cpp
diff --git a/aegisub/src/visual_tool_clip.h b/src/visual_tool_clip.h
similarity index 100%
rename from aegisub/src/visual_tool_clip.h
rename to src/visual_tool_clip.h
diff --git a/aegisub/src/visual_tool_cross.cpp b/src/visual_tool_cross.cpp
similarity index 100%
rename from aegisub/src/visual_tool_cross.cpp
rename to src/visual_tool_cross.cpp
diff --git a/aegisub/src/visual_tool_cross.h b/src/visual_tool_cross.h
similarity index 100%
rename from aegisub/src/visual_tool_cross.h
rename to src/visual_tool_cross.h
diff --git a/aegisub/src/visual_tool_drag.cpp b/src/visual_tool_drag.cpp
similarity index 100%
rename from aegisub/src/visual_tool_drag.cpp
rename to src/visual_tool_drag.cpp
diff --git a/aegisub/src/visual_tool_drag.h b/src/visual_tool_drag.h
similarity index 100%
rename from aegisub/src/visual_tool_drag.h
rename to src/visual_tool_drag.h
diff --git a/aegisub/src/visual_tool_rotatexy.cpp b/src/visual_tool_rotatexy.cpp
similarity index 100%
rename from aegisub/src/visual_tool_rotatexy.cpp
rename to src/visual_tool_rotatexy.cpp
diff --git a/aegisub/src/visual_tool_rotatexy.h b/src/visual_tool_rotatexy.h
similarity index 100%
rename from aegisub/src/visual_tool_rotatexy.h
rename to src/visual_tool_rotatexy.h
diff --git a/aegisub/src/visual_tool_rotatez.cpp b/src/visual_tool_rotatez.cpp
similarity index 100%
rename from aegisub/src/visual_tool_rotatez.cpp
rename to src/visual_tool_rotatez.cpp
diff --git a/aegisub/src/visual_tool_rotatez.h b/src/visual_tool_rotatez.h
similarity index 100%
rename from aegisub/src/visual_tool_rotatez.h
rename to src/visual_tool_rotatez.h
diff --git a/aegisub/src/visual_tool_scale.cpp b/src/visual_tool_scale.cpp
similarity index 100%
rename from aegisub/src/visual_tool_scale.cpp
rename to src/visual_tool_scale.cpp
diff --git a/aegisub/src/visual_tool_scale.h b/src/visual_tool_scale.h
similarity index 100%
rename from aegisub/src/visual_tool_scale.h
rename to src/visual_tool_scale.h
diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/src/visual_tool_vector_clip.cpp
similarity index 100%
rename from aegisub/src/visual_tool_vector_clip.cpp
rename to src/visual_tool_vector_clip.cpp
diff --git a/aegisub/src/visual_tool_vector_clip.h b/src/visual_tool_vector_clip.h
similarity index 100%
rename from aegisub/src/visual_tool_vector_clip.h
rename to src/visual_tool_vector_clip.h
diff --git a/aegisub/tests/Makefile b/tests/Makefile
similarity index 100%
rename from aegisub/tests/Makefile
rename to tests/Makefile
diff --git a/aegisub/tests/keyframe/aegi.txt b/tests/keyframe/aegi.txt
similarity index 100%
rename from aegisub/tests/keyframe/aegi.txt
rename to tests/keyframe/aegi.txt
diff --git a/aegisub/tests/keyframe/empty.txt b/tests/keyframe/empty.txt
similarity index 100%
rename from aegisub/tests/keyframe/empty.txt
rename to tests/keyframe/empty.txt
diff --git a/aegisub/tests/keyframe/garbage.txt b/tests/keyframe/garbage.txt
similarity index 100%
rename from aegisub/tests/keyframe/garbage.txt
rename to tests/keyframe/garbage.txt
diff --git a/aegisub/tests/keyframe/x264.log b/tests/keyframe/x264.log
similarity index 100%
rename from aegisub/tests/keyframe/x264.log
rename to tests/keyframe/x264.log
diff --git a/aegisub/tests/keyframe/xvid.txt b/tests/keyframe/xvid.txt
similarity index 100%
rename from aegisub/tests/keyframe/xvid.txt
rename to tests/keyframe/xvid.txt
diff --git a/aegisub/tests/options/all_bool.json b/tests/options/all_bool.json
similarity index 100%
rename from aegisub/tests/options/all_bool.json
rename to tests/options/all_bool.json
diff --git a/aegisub/tests/options/all_types.json b/tests/options/all_types.json
similarity index 100%
rename from aegisub/tests/options/all_types.json
rename to tests/options/all_types.json
diff --git a/aegisub/tests/options/array_bool.json b/tests/options/array_bool.json
similarity index 100%
rename from aegisub/tests/options/array_bool.json
rename to tests/options/array_bool.json
diff --git a/aegisub/tests/options/array_double.json b/tests/options/array_double.json
similarity index 100%
rename from aegisub/tests/options/array_double.json
rename to tests/options/array_double.json
diff --git a/aegisub/tests/options/array_integer.json b/tests/options/array_integer.json
similarity index 100%
rename from aegisub/tests/options/array_integer.json
rename to tests/options/array_integer.json
diff --git a/aegisub/tests/options/array_string.json b/tests/options/array_string.json
similarity index 100%
rename from aegisub/tests/options/array_string.json
rename to tests/options/array_string.json
diff --git a/aegisub/tests/options/bool.json b/tests/options/bool.json
similarity index 100%
rename from aegisub/tests/options/bool.json
rename to tests/options/bool.json
diff --git a/aegisub/tests/options/double.json b/tests/options/double.json
similarity index 100%
rename from aegisub/tests/options/double.json
rename to tests/options/double.json
diff --git a/aegisub/tests/options/integer.json b/tests/options/integer.json
similarity index 100%
rename from aegisub/tests/options/integer.json
rename to tests/options/integer.json
diff --git a/aegisub/tests/options/null.json b/tests/options/null.json
similarity index 100%
rename from aegisub/tests/options/null.json
rename to tests/options/null.json
diff --git a/aegisub/tests/options/string.json b/tests/options/string.json
similarity index 100%
rename from aegisub/tests/options/string.json
rename to tests/options/string.json
diff --git a/aegisub/tests/setup.bat b/tests/setup.bat
similarity index 100%
rename from aegisub/tests/setup.bat
rename to tests/setup.bat
diff --git a/aegisub/tests/setup.sh b/tests/setup.sh
similarity index 100%
rename from aegisub/tests/setup.sh
rename to tests/setup.sh
diff --git a/aegisub/tests/support/main.cpp b/tests/support/main.cpp
similarity index 100%
rename from aegisub/tests/support/main.cpp
rename to tests/support/main.cpp
diff --git a/aegisub/tests/support/main.h b/tests/support/main.h
similarity index 100%
rename from aegisub/tests/support/main.h
rename to tests/support/main.h
diff --git a/aegisub/tests/support/util.cpp b/tests/support/util.cpp
similarity index 100%
rename from aegisub/tests/support/util.cpp
rename to tests/support/util.cpp
diff --git a/aegisub/tests/support/util.h b/tests/support/util.h
similarity index 100%
rename from aegisub/tests/support/util.h
rename to tests/support/util.h
diff --git a/aegisub/tests/support/util_unix.cpp b/tests/support/util_unix.cpp
similarity index 100%
rename from aegisub/tests/support/util_unix.cpp
rename to tests/support/util_unix.cpp
diff --git a/aegisub/tests/support/util_windows.cpp b/tests/support/util_windows.cpp
similarity index 100%
rename from aegisub/tests/support/util_windows.cpp
rename to tests/support/util_windows.cpp
diff --git a/aegisub/tests/tests/access.cpp b/tests/tests/access.cpp
similarity index 100%
rename from aegisub/tests/tests/access.cpp
rename to tests/tests/access.cpp
diff --git a/aegisub/tests/tests/cajun.cpp b/tests/tests/cajun.cpp
similarity index 100%
rename from aegisub/tests/tests/cajun.cpp
rename to tests/tests/cajun.cpp
diff --git a/aegisub/tests/tests/color.cpp b/tests/tests/color.cpp
similarity index 100%
rename from aegisub/tests/tests/color.cpp
rename to tests/tests/color.cpp
diff --git a/aegisub/tests/tests/dialogue_lexer.cpp b/tests/tests/dialogue_lexer.cpp
similarity index 100%
rename from aegisub/tests/tests/dialogue_lexer.cpp
rename to tests/tests/dialogue_lexer.cpp
diff --git a/aegisub/tests/tests/fs.cpp b/tests/tests/fs.cpp
similarity index 100%
rename from aegisub/tests/tests/fs.cpp
rename to tests/tests/fs.cpp
diff --git a/aegisub/tests/tests/hotkey.cpp b/tests/tests/hotkey.cpp
similarity index 100%
rename from aegisub/tests/tests/hotkey.cpp
rename to tests/tests/hotkey.cpp
diff --git a/aegisub/tests/tests/iconv.cpp b/tests/tests/iconv.cpp
similarity index 100%
rename from aegisub/tests/tests/iconv.cpp
rename to tests/tests/iconv.cpp
diff --git a/aegisub/tests/tests/ifind.cpp b/tests/tests/ifind.cpp
similarity index 100%
rename from aegisub/tests/tests/ifind.cpp
rename to tests/tests/ifind.cpp
diff --git a/aegisub/tests/tests/karaoke_matcher.cpp b/tests/tests/karaoke_matcher.cpp
similarity index 100%
rename from aegisub/tests/tests/karaoke_matcher.cpp
rename to tests/tests/karaoke_matcher.cpp
diff --git a/aegisub/tests/tests/keyframe.cpp b/tests/tests/keyframe.cpp
similarity index 100%
rename from aegisub/tests/tests/keyframe.cpp
rename to tests/tests/keyframe.cpp
diff --git a/aegisub/tests/tests/line_iterator.cpp b/tests/tests/line_iterator.cpp
similarity index 100%
rename from aegisub/tests/tests/line_iterator.cpp
rename to tests/tests/line_iterator.cpp
diff --git a/aegisub/tests/tests/line_wrap.cpp b/tests/tests/line_wrap.cpp
similarity index 100%
rename from aegisub/tests/tests/line_wrap.cpp
rename to tests/tests/line_wrap.cpp
diff --git a/aegisub/tests/tests/mru.cpp b/tests/tests/mru.cpp
similarity index 100%
rename from aegisub/tests/tests/mru.cpp
rename to tests/tests/mru.cpp
diff --git a/aegisub/tests/tests/option.cpp b/tests/tests/option.cpp
similarity index 100%
rename from aegisub/tests/tests/option.cpp
rename to tests/tests/option.cpp
diff --git a/aegisub/tests/tests/path.cpp b/tests/tests/path.cpp
similarity index 100%
rename from aegisub/tests/tests/path.cpp
rename to tests/tests/path.cpp
diff --git a/aegisub/tests/tests/signals.cpp b/tests/tests/signals.cpp
similarity index 100%
rename from aegisub/tests/tests/signals.cpp
rename to tests/tests/signals.cpp
diff --git a/aegisub/tests/tests/syntax_highlight.cpp b/tests/tests/syntax_highlight.cpp
similarity index 100%
rename from aegisub/tests/tests/syntax_highlight.cpp
rename to tests/tests/syntax_highlight.cpp
diff --git a/aegisub/tests/tests/thesaurus.cpp b/tests/tests/thesaurus.cpp
similarity index 100%
rename from aegisub/tests/tests/thesaurus.cpp
rename to tests/tests/thesaurus.cpp
diff --git a/aegisub/tests/tests/util.cpp b/tests/tests/util.cpp
similarity index 100%
rename from aegisub/tests/tests/util.cpp
rename to tests/tests/util.cpp
diff --git a/aegisub/tests/tests/uuencode.cpp b/tests/tests/uuencode.cpp
similarity index 100%
rename from aegisub/tests/tests/uuencode.cpp
rename to tests/tests/uuencode.cpp
diff --git a/aegisub/tests/tests/vfr.cpp b/tests/tests/vfr.cpp
similarity index 100%
rename from aegisub/tests/tests/vfr.cpp
rename to tests/tests/vfr.cpp
diff --git a/aegisub/tests/tests/word_split.cpp b/tests/tests/word_split.cpp
similarity index 100%
rename from aegisub/tests/tests/word_split.cpp
rename to tests/tests/word_split.cpp
diff --git a/aegisub/tests/vfr/empty.txt b/tests/vfr/empty.txt
similarity index 100%
rename from aegisub/tests/vfr/empty.txt
rename to tests/vfr/empty.txt
diff --git a/aegisub/tests/vfr/v1_assume_30.txt b/tests/vfr/v1_assume_30.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_assume_30.txt
rename to tests/vfr/v1_assume_30.txt
diff --git a/aegisub/tests/vfr/v1_assume_30_with_override.txt b/tests/vfr/v1_assume_30_with_override.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_assume_30_with_override.txt
rename to tests/vfr/v1_assume_30_with_override.txt
diff --git a/aegisub/tests/vfr/v1_assume_int.txt b/tests/vfr/v1_assume_int.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_assume_int.txt
rename to tests/vfr/v1_assume_int.txt
diff --git a/aegisub/tests/vfr/v1_assume_over_1000.txt b/tests/vfr/v1_assume_over_1000.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_assume_over_1000.txt
rename to tests/vfr/v1_assume_over_1000.txt
diff --git a/aegisub/tests/vfr/v1_bad_seperators.txt b/tests/vfr/v1_bad_seperators.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_bad_seperators.txt
rename to tests/vfr/v1_bad_seperators.txt
diff --git a/aegisub/tests/vfr/v1_end_less_than_start.txt b/tests/vfr/v1_end_less_than_start.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_end_less_than_start.txt
rename to tests/vfr/v1_end_less_than_start.txt
diff --git a/aegisub/tests/vfr/v1_float_frame_number.txt b/tests/vfr/v1_float_frame_number.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_float_frame_number.txt
rename to tests/vfr/v1_float_frame_number.txt
diff --git a/aegisub/tests/vfr/v1_fully_contained.txt b/tests/vfr/v1_fully_contained.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_fully_contained.txt
rename to tests/vfr/v1_fully_contained.txt
diff --git a/aegisub/tests/vfr/v1_mode5.txt b/tests/vfr/v1_mode5.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_mode5.txt
rename to tests/vfr/v1_mode5.txt
diff --git a/aegisub/tests/vfr/v1_negative_start_of_range.txt b/tests/vfr/v1_negative_start_of_range.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_negative_start_of_range.txt
rename to tests/vfr/v1_negative_start_of_range.txt
diff --git a/aegisub/tests/vfr/v1_out_of_order.txt b/tests/vfr/v1_out_of_order.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_out_of_order.txt
rename to tests/vfr/v1_out_of_order.txt
diff --git a/aegisub/tests/vfr/v1_override_over_1000.txt b/tests/vfr/v1_override_over_1000.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_override_over_1000.txt
rename to tests/vfr/v1_override_over_1000.txt
diff --git a/aegisub/tests/vfr/v1_override_zero.txt b/tests/vfr/v1_override_zero.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_override_zero.txt
rename to tests/vfr/v1_override_zero.txt
diff --git a/aegisub/tests/vfr/v1_start_end_overlap.txt b/tests/vfr/v1_start_end_overlap.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_start_end_overlap.txt
rename to tests/vfr/v1_start_end_overlap.txt
diff --git a/aegisub/tests/vfr/v1_start_equals_end.txt b/tests/vfr/v1_start_equals_end.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_start_equals_end.txt
rename to tests/vfr/v1_start_equals_end.txt
diff --git a/aegisub/tests/vfr/v1_too_few_parts.txt b/tests/vfr/v1_too_few_parts.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_too_few_parts.txt
rename to tests/vfr/v1_too_few_parts.txt
diff --git a/aegisub/tests/vfr/v1_too_many_parts.txt b/tests/vfr/v1_too_many_parts.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_too_many_parts.txt
rename to tests/vfr/v1_too_many_parts.txt
diff --git a/aegisub/tests/vfr/v1_whitespace.txt b/tests/vfr/v1_whitespace.txt
similarity index 100%
rename from aegisub/tests/vfr/v1_whitespace.txt
rename to tests/vfr/v1_whitespace.txt
diff --git a/aegisub/tests/vfr/v2_100_frames_30_fps.txt b/tests/vfr/v2_100_frames_30_fps.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_100_frames_30_fps.txt
rename to tests/vfr/v2_100_frames_30_fps.txt
diff --git a/aegisub/tests/vfr/v2_100_frames_30_with_override.txt b/tests/vfr/v2_100_frames_30_with_override.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_100_frames_30_with_override.txt
rename to tests/vfr/v2_100_frames_30_with_override.txt
diff --git a/aegisub/tests/vfr/v2_1fps.txt b/tests/vfr/v2_1fps.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_1fps.txt
rename to tests/vfr/v2_1fps.txt
diff --git a/aegisub/tests/vfr/v2_comments.txt b/tests/vfr/v2_comments.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_comments.txt
rename to tests/vfr/v2_comments.txt
diff --git a/aegisub/tests/vfr/v2_empty.txt b/tests/vfr/v2_empty.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_empty.txt
rename to tests/vfr/v2_empty.txt
diff --git a/aegisub/tests/vfr/v2_len_3_10.txt b/tests/vfr/v2_len_3_10.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_len_3_10.txt
rename to tests/vfr/v2_len_3_10.txt
diff --git a/aegisub/tests/vfr/v2_mode5.txt b/tests/vfr/v2_mode5.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_mode5.txt
rename to tests/vfr/v2_mode5.txt
diff --git a/aegisub/tests/vfr/v2_nolen.txt b/tests/vfr/v2_nolen.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_nolen.txt
rename to tests/vfr/v2_nolen.txt
diff --git a/aegisub/tests/vfr/v2_number_in_comment.txt b/tests/vfr/v2_number_in_comment.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_number_in_comment.txt
rename to tests/vfr/v2_number_in_comment.txt
diff --git a/aegisub/tests/vfr/v2_out_of_order.txt b/tests/vfr/v2_out_of_order.txt
similarity index 100%
rename from aegisub/tests/vfr/v2_out_of_order.txt
rename to tests/vfr/v2_out_of_order.txt
diff --git a/aegisub/tests/vfr/validate_base.txt b/tests/vfr/validate_base.txt
similarity index 100%
rename from aegisub/tests/vfr/validate_base.txt
rename to tests/vfr/validate_base.txt
diff --git a/aegisub/tests/vfr/validate_different.txt b/tests/vfr/validate_different.txt
similarity index 100%
rename from aegisub/tests/vfr/validate_different.txt
rename to tests/vfr/validate_different.txt
diff --git a/aegisub/tests/vfr/validate_longer.txt b/tests/vfr/validate_longer.txt
similarity index 100%
rename from aegisub/tests/vfr/validate_longer.txt
rename to tests/vfr/validate_longer.txt
diff --git a/aegisub/tests/vfr/validate_shorter.txt b/tests/vfr/validate_shorter.txt
similarity index 100%
rename from aegisub/tests/vfr/validate_shorter.txt
rename to tests/vfr/validate_shorter.txt
diff --git a/aegisub/tools/Makefile b/tools/Makefile
similarity index 100%
rename from aegisub/tools/Makefile
rename to tools/Makefile
diff --git a/aegisub/tools/common-respack.cpp b/tools/common-respack.cpp
similarity index 100%
rename from aegisub/tools/common-respack.cpp
rename to tools/common-respack.cpp
diff --git a/aegisub/tools/osx-bundle-restart-helper.c b/tools/osx-bundle-restart-helper.c
similarity index 100%
rename from aegisub/tools/osx-bundle-restart-helper.c
rename to tools/osx-bundle-restart-helper.c
diff --git a/aegisub/tools/osx-bundle.sed.in b/tools/osx-bundle.sed.in
similarity index 100%
rename from aegisub/tools/osx-bundle.sed.in
rename to tools/osx-bundle.sed.in
diff --git a/aegisub/tools/osx-bundle.sh b/tools/osx-bundle.sh
similarity index 100%
rename from aegisub/tools/osx-bundle.sh
rename to tools/osx-bundle.sh
diff --git a/aegisub/tools/osx-dmg.sh b/tools/osx-dmg.sh
similarity index 100%
rename from aegisub/tools/osx-dmg.sh
rename to tools/osx-dmg.sh
diff --git a/aegisub/tools/osx-fix-libs.py b/tools/osx-fix-libs.py
similarity index 100%
rename from aegisub/tools/osx-fix-libs.py
rename to tools/osx-fix-libs.py
diff --git a/aegisub/tools/repack-thes-dict.cpp b/tools/repack-thes-dict.cpp
similarity index 100%
rename from aegisub/tools/repack-thes-dict.cpp
rename to tools/repack-thes-dict.cpp
diff --git a/aegisub/vendor/boost b/vendor/boost
similarity index 100%
rename from aegisub/vendor/boost
rename to vendor/boost
diff --git a/aegisub/vendor/csri/Doxyfile b/vendor/csri/Doxyfile
similarity index 100%
rename from aegisub/vendor/csri/Doxyfile
rename to vendor/csri/Doxyfile
diff --git a/aegisub/vendor/csri/LICENSE b/vendor/csri/LICENSE
similarity index 100%
rename from aegisub/vendor/csri/LICENSE
rename to vendor/csri/LICENSE
diff --git a/aegisub/vendor/csri/Makefile.am b/vendor/csri/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/Makefile.am
rename to vendor/csri/Makefile.am
diff --git a/aegisub/vendor/csri/ac/Makefile.am b/vendor/csri/ac/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/ac/Makefile.am
rename to vendor/csri/ac/Makefile.am
diff --git a/aegisub/vendor/csri/acinclude.m4 b/vendor/csri/acinclude.m4
similarity index 100%
rename from aegisub/vendor/csri/acinclude.m4
rename to vendor/csri/acinclude.m4
diff --git a/aegisub/vendor/csri/backends/Makefile.am b/vendor/csri/backends/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/backends/Makefile.am
rename to vendor/csri/backends/Makefile.am
diff --git a/aegisub/vendor/csri/backends/libass/Makefile.am b/vendor/csri/backends/libass/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/backends/libass/Makefile.am
rename to vendor/csri/backends/libass/Makefile.am
diff --git a/aegisub/vendor/csri/backends/libass/libass_csri.c b/vendor/csri/backends/libass/libass_csri.c
similarity index 100%
rename from aegisub/vendor/csri/backends/libass/libass_csri.c
rename to vendor/csri/backends/libass/libass_csri.c
diff --git a/aegisub/vendor/csri/bootstrap b/vendor/csri/bootstrap
similarity index 100%
rename from aegisub/vendor/csri/bootstrap
rename to vendor/csri/bootstrap
diff --git a/aegisub/vendor/csri/configure.ac b/vendor/csri/configure.ac
similarity index 100%
rename from aegisub/vendor/csri/configure.ac
rename to vendor/csri/configure.ac
diff --git a/aegisub/vendor/csri/csri.pc.in b/vendor/csri/csri.pc.in
similarity index 100%
rename from aegisub/vendor/csri/csri.pc.in
rename to vendor/csri/csri.pc.in
diff --git a/aegisub/vendor/csri/csri_2008.vcproj b/vendor/csri/csri_2008.vcproj
similarity index 100%
rename from aegisub/vendor/csri/csri_2008.vcproj
rename to vendor/csri/csri_2008.vcproj
diff --git a/aegisub/vendor/csri/frontends/Makefile.am b/vendor/csri/frontends/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/frontends/Makefile.am
rename to vendor/csri/frontends/Makefile.am
diff --git a/aegisub/vendor/csri/frontends/avisynth25/Makefile.am b/vendor/csri/frontends/avisynth25/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/frontends/avisynth25/Makefile.am
rename to vendor/csri/frontends/avisynth25/Makefile.am
diff --git a/aegisub/vendor/csri/frontends/avisynth25/avisynth.cpp b/vendor/csri/frontends/avisynth25/avisynth.cpp
similarity index 100%
rename from aegisub/vendor/csri/frontends/avisynth25/avisynth.cpp
rename to vendor/csri/frontends/avisynth25/avisynth.cpp
diff --git a/aegisub/vendor/csri/frontends/avisynth25/avisynth.h b/vendor/csri/frontends/avisynth25/avisynth.h
similarity index 100%
rename from aegisub/vendor/csri/frontends/avisynth25/avisynth.h
rename to vendor/csri/frontends/avisynth25/avisynth.h
diff --git a/aegisub/vendor/csri/frontends/cmdline/Makefile.am b/vendor/csri/frontends/cmdline/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/frontends/cmdline/Makefile.am
rename to vendor/csri/frontends/cmdline/Makefile.am
diff --git a/aegisub/vendor/csri/frontends/cmdline/cmdmain.c b/vendor/csri/frontends/cmdline/cmdmain.c
similarity index 100%
rename from aegisub/vendor/csri/frontends/cmdline/cmdmain.c
rename to vendor/csri/frontends/cmdline/cmdmain.c
diff --git a/aegisub/vendor/csri/frontends/cmdline/render.c b/vendor/csri/frontends/cmdline/render.c
similarity index 100%
rename from aegisub/vendor/csri/frontends/cmdline/render.c
rename to vendor/csri/frontends/cmdline/render.c
diff --git a/aegisub/vendor/csri/frontends/cmdline/render.h b/vendor/csri/frontends/cmdline/render.h
similarity index 100%
rename from aegisub/vendor/csri/frontends/cmdline/render.h
rename to vendor/csri/frontends/cmdline/render.h
diff --git a/aegisub/vendor/csri/include/Makefile.am b/vendor/csri/include/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/include/Makefile.am
rename to vendor/csri/include/Makefile.am
diff --git a/aegisub/vendor/csri/include/csri/csri.h b/vendor/csri/include/csri/csri.h
similarity index 100%
rename from aegisub/vendor/csri/include/csri/csri.h
rename to vendor/csri/include/csri/csri.h
diff --git a/aegisub/vendor/csri/include/csri/fmtids.h b/vendor/csri/include/csri/fmtids.h
similarity index 100%
rename from aegisub/vendor/csri/include/csri/fmtids.h
rename to vendor/csri/include/csri/fmtids.h
diff --git a/aegisub/vendor/csri/include/csri/logging.h b/vendor/csri/include/csri/logging.h
similarity index 100%
rename from aegisub/vendor/csri/include/csri/logging.h
rename to vendor/csri/include/csri/logging.h
diff --git a/aegisub/vendor/csri/include/csri/openerr.h b/vendor/csri/include/csri/openerr.h
similarity index 100%
rename from aegisub/vendor/csri/include/csri/openerr.h
rename to vendor/csri/include/csri/openerr.h
diff --git a/aegisub/vendor/csri/include/csri/stream.h b/vendor/csri/include/csri/stream.h
similarity index 100%
rename from aegisub/vendor/csri/include/csri/stream.h
rename to vendor/csri/include/csri/stream.h
diff --git a/aegisub/vendor/csri/include/subhelp.h b/vendor/csri/include/subhelp.h
similarity index 100%
rename from aegisub/vendor/csri/include/subhelp.h
rename to vendor/csri/include/subhelp.h
diff --git a/aegisub/vendor/csri/include/visibility.h b/vendor/csri/include/visibility.h
similarity index 100%
rename from aegisub/vendor/csri/include/visibility.h
rename to vendor/csri/include/visibility.h
diff --git a/aegisub/vendor/csri/lib/Makefile.am b/vendor/csri/lib/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/lib/Makefile.am
rename to vendor/csri/lib/Makefile.am
diff --git a/aegisub/vendor/csri/lib/csrilib.h b/vendor/csri/lib/csrilib.h
similarity index 100%
rename from aegisub/vendor/csri/lib/csrilib.h
rename to vendor/csri/lib/csrilib.h
diff --git a/aegisub/vendor/csri/lib/list.c b/vendor/csri/lib/list.c
similarity index 100%
rename from aegisub/vendor/csri/lib/list.c
rename to vendor/csri/lib/list.c
diff --git a/aegisub/vendor/csri/lib/posix/csrilib_os.h b/vendor/csri/lib/posix/csrilib_os.h
similarity index 100%
rename from aegisub/vendor/csri/lib/posix/csrilib_os.h
rename to vendor/csri/lib/posix/csrilib_os.h
diff --git a/aegisub/vendor/csri/lib/posix/enumerate.c b/vendor/csri/lib/posix/enumerate.c
similarity index 100%
rename from aegisub/vendor/csri/lib/posix/enumerate.c
rename to vendor/csri/lib/posix/enumerate.c
diff --git a/aegisub/vendor/csri/lib/win32/csrilib_os.h b/vendor/csri/lib/win32/csrilib_os.h
similarity index 100%
rename from aegisub/vendor/csri/lib/win32/csrilib_os.h
rename to vendor/csri/lib/win32/csrilib_os.h
diff --git a/aegisub/vendor/csri/lib/win32/enumerate.c b/vendor/csri/lib/win32/enumerate.c
similarity index 100%
rename from aegisub/vendor/csri/lib/win32/enumerate.c
rename to vendor/csri/lib/win32/enumerate.c
diff --git a/aegisub/vendor/csri/lib/wrap.c b/vendor/csri/lib/wrap.c
similarity index 100%
rename from aegisub/vendor/csri/lib/wrap.c
rename to vendor/csri/lib/wrap.c
diff --git a/aegisub/vendor/csri/subhelp/Makefile.am b/vendor/csri/subhelp/Makefile.am
similarity index 100%
rename from aegisub/vendor/csri/subhelp/Makefile.am
rename to vendor/csri/subhelp/Makefile.am
diff --git a/aegisub/vendor/csri/subhelp/logging.c b/vendor/csri/subhelp/logging.c
similarity index 100%
rename from aegisub/vendor/csri/subhelp/logging.c
rename to vendor/csri/subhelp/logging.c
diff --git a/aegisub/vendor/csri/subhelp/posix/openfile.c b/vendor/csri/subhelp/posix/openfile.c
similarity index 100%
rename from aegisub/vendor/csri/subhelp/posix/openfile.c
rename to vendor/csri/subhelp/posix/openfile.c
diff --git a/aegisub/vendor/csri/subhelp/win32/openfile.c b/vendor/csri/subhelp/win32/openfile.c
similarity index 100%
rename from aegisub/vendor/csri/subhelp/win32/openfile.c
rename to vendor/csri/subhelp/win32/openfile.c
diff --git a/aegisub/vendor/ffmpeg b/vendor/ffmpeg
similarity index 100%
rename from aegisub/vendor/ffmpeg
rename to vendor/ffmpeg
diff --git a/aegisub/vendor/ffms2 b/vendor/ffms2
similarity index 100%
rename from aegisub/vendor/ffms2
rename to vendor/ffms2
diff --git a/aegisub/vendor/fftw b/vendor/fftw
similarity index 100%
rename from aegisub/vendor/fftw
rename to vendor/fftw
diff --git a/aegisub/vendor/fontconfig b/vendor/fontconfig
similarity index 100%
rename from aegisub/vendor/fontconfig
rename to vendor/fontconfig
diff --git a/aegisub/vendor/freetype2 b/vendor/freetype2
similarity index 100%
rename from aegisub/vendor/freetype2
rename to vendor/freetype2
diff --git a/aegisub/vendor/fribidi b/vendor/fribidi
similarity index 100%
rename from aegisub/vendor/fribidi
rename to vendor/fribidi
diff --git a/aegisub/vendor/googletest b/vendor/googletest
similarity index 100%
rename from aegisub/vendor/googletest
rename to vendor/googletest
diff --git a/aegisub/vendor/hunspell/ABOUT-NLS b/vendor/hunspell/ABOUT-NLS
similarity index 100%
rename from aegisub/vendor/hunspell/ABOUT-NLS
rename to vendor/hunspell/ABOUT-NLS
diff --git a/aegisub/vendor/hunspell/AUTHORS b/vendor/hunspell/AUTHORS
similarity index 100%
rename from aegisub/vendor/hunspell/AUTHORS
rename to vendor/hunspell/AUTHORS
diff --git a/aegisub/vendor/hunspell/AUTHORS.myspell b/vendor/hunspell/AUTHORS.myspell
similarity index 100%
rename from aegisub/vendor/hunspell/AUTHORS.myspell
rename to vendor/hunspell/AUTHORS.myspell
diff --git a/aegisub/vendor/hunspell/BUGS b/vendor/hunspell/BUGS
similarity index 100%
rename from aegisub/vendor/hunspell/BUGS
rename to vendor/hunspell/BUGS
diff --git a/aegisub/vendor/hunspell/COPYING b/vendor/hunspell/COPYING
similarity index 100%
rename from aegisub/vendor/hunspell/COPYING
rename to vendor/hunspell/COPYING
diff --git a/aegisub/vendor/hunspell/COPYING.LGPL b/vendor/hunspell/COPYING.LGPL
similarity index 100%
rename from aegisub/vendor/hunspell/COPYING.LGPL
rename to vendor/hunspell/COPYING.LGPL
diff --git a/aegisub/vendor/hunspell/COPYING.MPL b/vendor/hunspell/COPYING.MPL
similarity index 100%
rename from aegisub/vendor/hunspell/COPYING.MPL
rename to vendor/hunspell/COPYING.MPL
diff --git a/aegisub/vendor/hunspell/ChangeLog b/vendor/hunspell/ChangeLog
similarity index 100%
rename from aegisub/vendor/hunspell/ChangeLog
rename to vendor/hunspell/ChangeLog
diff --git a/aegisub/vendor/hunspell/ChangeLog.O b/vendor/hunspell/ChangeLog.O
similarity index 100%
rename from aegisub/vendor/hunspell/ChangeLog.O
rename to vendor/hunspell/ChangeLog.O
diff --git a/aegisub/vendor/hunspell/INSTALL b/vendor/hunspell/INSTALL
similarity index 100%
rename from aegisub/vendor/hunspell/INSTALL
rename to vendor/hunspell/INSTALL
diff --git a/aegisub/vendor/hunspell/NEWS b/vendor/hunspell/NEWS
similarity index 100%
rename from aegisub/vendor/hunspell/NEWS
rename to vendor/hunspell/NEWS
diff --git a/aegisub/vendor/hunspell/README b/vendor/hunspell/README
similarity index 100%
rename from aegisub/vendor/hunspell/README
rename to vendor/hunspell/README
diff --git a/aegisub/vendor/hunspell/README.myspell b/vendor/hunspell/README.myspell
similarity index 100%
rename from aegisub/vendor/hunspell/README.myspell
rename to vendor/hunspell/README.myspell
diff --git a/aegisub/vendor/hunspell/THANKS b/vendor/hunspell/THANKS
similarity index 100%
rename from aegisub/vendor/hunspell/THANKS
rename to vendor/hunspell/THANKS
diff --git a/aegisub/vendor/hunspell/TODO b/vendor/hunspell/TODO
similarity index 100%
rename from aegisub/vendor/hunspell/TODO
rename to vendor/hunspell/TODO
diff --git a/aegisub/vendor/hunspell/license.hunspell b/vendor/hunspell/license.hunspell
similarity index 100%
rename from aegisub/vendor/hunspell/license.hunspell
rename to vendor/hunspell/license.hunspell
diff --git a/aegisub/vendor/hunspell/license.myspell b/vendor/hunspell/license.myspell
similarity index 100%
rename from aegisub/vendor/hunspell/license.myspell
rename to vendor/hunspell/license.myspell
diff --git a/aegisub/vendor/hunspell/src/hunspell/README b/vendor/hunspell/src/hunspell/README
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/README
rename to vendor/hunspell/src/hunspell/README
diff --git a/aegisub/vendor/hunspell/src/hunspell/affentry.cxx b/vendor/hunspell/src/hunspell/affentry.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/affentry.cxx
rename to vendor/hunspell/src/hunspell/affentry.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/affentry.hxx b/vendor/hunspell/src/hunspell/affentry.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/affentry.hxx
rename to vendor/hunspell/src/hunspell/affentry.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/affixmgr.cxx b/vendor/hunspell/src/hunspell/affixmgr.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/affixmgr.cxx
rename to vendor/hunspell/src/hunspell/affixmgr.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/affixmgr.hxx b/vendor/hunspell/src/hunspell/affixmgr.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/affixmgr.hxx
rename to vendor/hunspell/src/hunspell/affixmgr.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/atypes.hxx b/vendor/hunspell/src/hunspell/atypes.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/atypes.hxx
rename to vendor/hunspell/src/hunspell/atypes.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/baseaffix.hxx b/vendor/hunspell/src/hunspell/baseaffix.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/baseaffix.hxx
rename to vendor/hunspell/src/hunspell/baseaffix.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/csutil.cxx b/vendor/hunspell/src/hunspell/csutil.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/csutil.cxx
rename to vendor/hunspell/src/hunspell/csutil.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/csutil.hxx b/vendor/hunspell/src/hunspell/csutil.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/csutil.hxx
rename to vendor/hunspell/src/hunspell/csutil.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/dictmgr.cxx b/vendor/hunspell/src/hunspell/dictmgr.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/dictmgr.cxx
rename to vendor/hunspell/src/hunspell/dictmgr.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/dictmgr.hxx b/vendor/hunspell/src/hunspell/dictmgr.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/dictmgr.hxx
rename to vendor/hunspell/src/hunspell/dictmgr.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/filemgr.cxx b/vendor/hunspell/src/hunspell/filemgr.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/filemgr.cxx
rename to vendor/hunspell/src/hunspell/filemgr.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/filemgr.hxx b/vendor/hunspell/src/hunspell/filemgr.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/filemgr.hxx
rename to vendor/hunspell/src/hunspell/filemgr.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/hashmgr.cxx b/vendor/hunspell/src/hunspell/hashmgr.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hashmgr.cxx
rename to vendor/hunspell/src/hunspell/hashmgr.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/hashmgr.hxx b/vendor/hunspell/src/hunspell/hashmgr.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hashmgr.hxx
rename to vendor/hunspell/src/hunspell/hashmgr.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/htypes.hxx b/vendor/hunspell/src/hunspell/htypes.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/htypes.hxx
rename to vendor/hunspell/src/hunspell/htypes.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/hunspell.cxx b/vendor/hunspell/src/hunspell/hunspell.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hunspell.cxx
rename to vendor/hunspell/src/hunspell/hunspell.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/hunspell.dsp b/vendor/hunspell/src/hunspell/hunspell.dsp
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hunspell.dsp
rename to vendor/hunspell/src/hunspell/hunspell.dsp
diff --git a/aegisub/vendor/hunspell/src/hunspell/hunspell.h b/vendor/hunspell/src/hunspell/hunspell.h
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hunspell.h
rename to vendor/hunspell/src/hunspell/hunspell.h
diff --git a/aegisub/vendor/hunspell/src/hunspell/hunspell.hxx b/vendor/hunspell/src/hunspell/hunspell.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hunspell.hxx
rename to vendor/hunspell/src/hunspell/hunspell.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/hunvisapi.h b/vendor/hunspell/src/hunspell/hunvisapi.h
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hunvisapi.h
rename to vendor/hunspell/src/hunspell/hunvisapi.h
diff --git a/aegisub/vendor/hunspell/src/hunspell/hunvisapi.h.in b/vendor/hunspell/src/hunspell/hunvisapi.h.in
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hunvisapi.h.in
rename to vendor/hunspell/src/hunspell/hunvisapi.h.in
diff --git a/aegisub/vendor/hunspell/src/hunspell/hunzip.cxx b/vendor/hunspell/src/hunspell/hunzip.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hunzip.cxx
rename to vendor/hunspell/src/hunspell/hunzip.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/hunzip.hxx b/vendor/hunspell/src/hunspell/hunzip.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/hunzip.hxx
rename to vendor/hunspell/src/hunspell/hunzip.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/langnum.hxx b/vendor/hunspell/src/hunspell/langnum.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/langnum.hxx
rename to vendor/hunspell/src/hunspell/langnum.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/license.hunspell b/vendor/hunspell/src/hunspell/license.hunspell
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/license.hunspell
rename to vendor/hunspell/src/hunspell/license.hunspell
diff --git a/aegisub/vendor/hunspell/src/hunspell/license.myspell b/vendor/hunspell/src/hunspell/license.myspell
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/license.myspell
rename to vendor/hunspell/src/hunspell/license.myspell
diff --git a/aegisub/vendor/hunspell/src/hunspell/makefile.mk b/vendor/hunspell/src/hunspell/makefile.mk
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/makefile.mk
rename to vendor/hunspell/src/hunspell/makefile.mk
diff --git a/aegisub/vendor/hunspell/src/hunspell/phonet.cxx b/vendor/hunspell/src/hunspell/phonet.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/phonet.cxx
rename to vendor/hunspell/src/hunspell/phonet.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/phonet.hxx b/vendor/hunspell/src/hunspell/phonet.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/phonet.hxx
rename to vendor/hunspell/src/hunspell/phonet.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/replist.cxx b/vendor/hunspell/src/hunspell/replist.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/replist.cxx
rename to vendor/hunspell/src/hunspell/replist.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/replist.hxx b/vendor/hunspell/src/hunspell/replist.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/replist.hxx
rename to vendor/hunspell/src/hunspell/replist.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/suggestmgr.cxx b/vendor/hunspell/src/hunspell/suggestmgr.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/suggestmgr.cxx
rename to vendor/hunspell/src/hunspell/suggestmgr.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/suggestmgr.hxx b/vendor/hunspell/src/hunspell/suggestmgr.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/suggestmgr.hxx
rename to vendor/hunspell/src/hunspell/suggestmgr.hxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/utf_info.cxx b/vendor/hunspell/src/hunspell/utf_info.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/utf_info.cxx
rename to vendor/hunspell/src/hunspell/utf_info.cxx
diff --git a/aegisub/vendor/hunspell/src/hunspell/w_char.hxx b/vendor/hunspell/src/hunspell/w_char.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/hunspell/w_char.hxx
rename to vendor/hunspell/src/hunspell/w_char.hxx
diff --git a/aegisub/vendor/hunspell/src/parsers/firstparser.cxx b/vendor/hunspell/src/parsers/firstparser.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/firstparser.cxx
rename to vendor/hunspell/src/parsers/firstparser.cxx
diff --git a/aegisub/vendor/hunspell/src/parsers/firstparser.hxx b/vendor/hunspell/src/parsers/firstparser.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/firstparser.hxx
rename to vendor/hunspell/src/parsers/firstparser.hxx
diff --git a/aegisub/vendor/hunspell/src/parsers/htmlparser.cxx b/vendor/hunspell/src/parsers/htmlparser.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/htmlparser.cxx
rename to vendor/hunspell/src/parsers/htmlparser.cxx
diff --git a/aegisub/vendor/hunspell/src/parsers/htmlparser.hxx b/vendor/hunspell/src/parsers/htmlparser.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/htmlparser.hxx
rename to vendor/hunspell/src/parsers/htmlparser.hxx
diff --git a/aegisub/vendor/hunspell/src/parsers/latexparser.cxx b/vendor/hunspell/src/parsers/latexparser.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/latexparser.cxx
rename to vendor/hunspell/src/parsers/latexparser.cxx
diff --git a/aegisub/vendor/hunspell/src/parsers/latexparser.hxx b/vendor/hunspell/src/parsers/latexparser.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/latexparser.hxx
rename to vendor/hunspell/src/parsers/latexparser.hxx
diff --git a/aegisub/vendor/hunspell/src/parsers/manparser.cxx b/vendor/hunspell/src/parsers/manparser.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/manparser.cxx
rename to vendor/hunspell/src/parsers/manparser.cxx
diff --git a/aegisub/vendor/hunspell/src/parsers/manparser.hxx b/vendor/hunspell/src/parsers/manparser.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/manparser.hxx
rename to vendor/hunspell/src/parsers/manparser.hxx
diff --git a/aegisub/vendor/hunspell/src/parsers/testparser.cxx b/vendor/hunspell/src/parsers/testparser.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/testparser.cxx
rename to vendor/hunspell/src/parsers/testparser.cxx
diff --git a/aegisub/vendor/hunspell/src/parsers/textparser.cxx b/vendor/hunspell/src/parsers/textparser.cxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/textparser.cxx
rename to vendor/hunspell/src/parsers/textparser.cxx
diff --git a/aegisub/vendor/hunspell/src/parsers/textparser.hxx b/vendor/hunspell/src/parsers/textparser.hxx
similarity index 100%
rename from aegisub/vendor/hunspell/src/parsers/textparser.hxx
rename to vendor/hunspell/src/parsers/textparser.hxx
diff --git a/aegisub/vendor/hunspell/src/win_api/Hunspell.rc b/vendor/hunspell/src/win_api/Hunspell.rc
similarity index 100%
rename from aegisub/vendor/hunspell/src/win_api/Hunspell.rc
rename to vendor/hunspell/src/win_api/Hunspell.rc
diff --git a/aegisub/vendor/hunspell/src/win_api/config.h b/vendor/hunspell/src/win_api/config.h
similarity index 100%
rename from aegisub/vendor/hunspell/src/win_api/config.h
rename to vendor/hunspell/src/win_api/config.h
diff --git a/aegisub/vendor/hunspell/src/win_api/hunspelldll.c b/vendor/hunspell/src/win_api/hunspelldll.c
similarity index 100%
rename from aegisub/vendor/hunspell/src/win_api/hunspelldll.c
rename to vendor/hunspell/src/win_api/hunspelldll.c
diff --git a/aegisub/vendor/hunspell/src/win_api/hunspelldll.h b/vendor/hunspell/src/win_api/hunspelldll.h
similarity index 100%
rename from aegisub/vendor/hunspell/src/win_api/hunspelldll.h
rename to vendor/hunspell/src/win_api/hunspelldll.h
diff --git a/aegisub/vendor/iconv/AUTHORS b/vendor/iconv/AUTHORS
similarity index 100%
rename from aegisub/vendor/iconv/AUTHORS
rename to vendor/iconv/AUTHORS
diff --git a/aegisub/vendor/iconv/COPYING b/vendor/iconv/COPYING
similarity index 100%
rename from aegisub/vendor/iconv/COPYING
rename to vendor/iconv/COPYING
diff --git a/aegisub/vendor/iconv/ChangeLog b/vendor/iconv/ChangeLog
similarity index 100%
rename from aegisub/vendor/iconv/ChangeLog
rename to vendor/iconv/ChangeLog
diff --git a/aegisub/vendor/iconv/DEPENDENCIES b/vendor/iconv/DEPENDENCIES
similarity index 100%
rename from aegisub/vendor/iconv/DEPENDENCIES
rename to vendor/iconv/DEPENDENCIES
diff --git a/aegisub/vendor/iconv/DESIGN b/vendor/iconv/DESIGN
similarity index 100%
rename from aegisub/vendor/iconv/DESIGN
rename to vendor/iconv/DESIGN
diff --git a/aegisub/vendor/iconv/HACKING b/vendor/iconv/HACKING
similarity index 100%
rename from aegisub/vendor/iconv/HACKING
rename to vendor/iconv/HACKING
diff --git a/aegisub/vendor/iconv/NEWS b/vendor/iconv/NEWS
similarity index 100%
rename from aegisub/vendor/iconv/NEWS
rename to vendor/iconv/NEWS
diff --git a/aegisub/vendor/iconv/NOTES b/vendor/iconv/NOTES
similarity index 100%
rename from aegisub/vendor/iconv/NOTES
rename to vendor/iconv/NOTES
diff --git a/aegisub/vendor/iconv/PORTS b/vendor/iconv/PORTS
similarity index 100%
rename from aegisub/vendor/iconv/PORTS
rename to vendor/iconv/PORTS
diff --git a/aegisub/vendor/iconv/README b/vendor/iconv/README
similarity index 100%
rename from aegisub/vendor/iconv/README
rename to vendor/iconv/README
diff --git a/aegisub/vendor/iconv/THANKS b/vendor/iconv/THANKS
similarity index 100%
rename from aegisub/vendor/iconv/THANKS
rename to vendor/iconv/THANKS
diff --git a/aegisub/vendor/iconv/include/iconv.h b/vendor/iconv/include/iconv.h
similarity index 100%
rename from aegisub/vendor/iconv/include/iconv.h
rename to vendor/iconv/include/iconv.h
diff --git a/aegisub/vendor/iconv/include/libcharset.h b/vendor/iconv/include/libcharset.h
similarity index 100%
rename from aegisub/vendor/iconv/include/libcharset.h
rename to vendor/iconv/include/libcharset.h
diff --git a/aegisub/vendor/iconv/include/localcharset.h b/vendor/iconv/include/localcharset.h
similarity index 100%
rename from aegisub/vendor/iconv/include/localcharset.h
rename to vendor/iconv/include/localcharset.h
diff --git a/aegisub/vendor/iconv/include/stdbool.h b/vendor/iconv/include/stdbool.h
similarity index 100%
rename from aegisub/vendor/iconv/include/stdbool.h
rename to vendor/iconv/include/stdbool.h
diff --git a/aegisub/vendor/iconv/libcharset/config.h b/vendor/iconv/libcharset/config.h
similarity index 100%
rename from aegisub/vendor/iconv/libcharset/config.h
rename to vendor/iconv/libcharset/config.h
diff --git a/aegisub/vendor/iconv/libcharset/localcharset.c b/vendor/iconv/libcharset/localcharset.c
similarity index 100%
rename from aegisub/vendor/iconv/libcharset/localcharset.c
rename to vendor/iconv/libcharset/localcharset.c
diff --git a/aegisub/vendor/iconv/libcharset/relocatable.c b/vendor/iconv/libcharset/relocatable.c
similarity index 100%
rename from aegisub/vendor/iconv/libcharset/relocatable.c
rename to vendor/iconv/libcharset/relocatable.c
diff --git a/aegisub/vendor/iconv/libcharset/relocatable.h b/vendor/iconv/libcharset/relocatable.h
similarity index 100%
rename from aegisub/vendor/iconv/libcharset/relocatable.h
rename to vendor/iconv/libcharset/relocatable.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases.h b/vendor/iconv/libiconv/aliases.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases.h
rename to vendor/iconv/libiconv/aliases.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases2.h b/vendor/iconv/libiconv/aliases2.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases2.h
rename to vendor/iconv/libiconv/aliases2.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_aix.h b/vendor/iconv/libiconv/aliases_aix.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_aix.h
rename to vendor/iconv/libiconv/aliases_aix.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_aix_sysaix.h b/vendor/iconv/libiconv/aliases_aix_sysaix.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_aix_sysaix.h
rename to vendor/iconv/libiconv/aliases_aix_sysaix.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_dos.h b/vendor/iconv/libiconv/aliases_dos.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_dos.h
rename to vendor/iconv/libiconv/aliases_dos.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_extra.h b/vendor/iconv/libiconv/aliases_extra.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_extra.h
rename to vendor/iconv/libiconv/aliases_extra.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_osf1.h b/vendor/iconv/libiconv/aliases_osf1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_osf1.h
rename to vendor/iconv/libiconv/aliases_osf1.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_osf1_sysosf1.h b/vendor/iconv/libiconv/aliases_osf1_sysosf1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_osf1_sysosf1.h
rename to vendor/iconv/libiconv/aliases_osf1_sysosf1.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_sysaix.h b/vendor/iconv/libiconv/aliases_sysaix.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_sysaix.h
rename to vendor/iconv/libiconv/aliases_sysaix.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_syshpux.h b/vendor/iconv/libiconv/aliases_syshpux.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_syshpux.h
rename to vendor/iconv/libiconv/aliases_syshpux.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_sysosf1.h b/vendor/iconv/libiconv/aliases_sysosf1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_sysosf1.h
rename to vendor/iconv/libiconv/aliases_sysosf1.h
diff --git a/aegisub/vendor/iconv/libiconv/aliases_syssolaris.h b/vendor/iconv/libiconv/aliases_syssolaris.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/aliases_syssolaris.h
rename to vendor/iconv/libiconv/aliases_syssolaris.h
diff --git a/aegisub/vendor/iconv/libiconv/armscii_8.h b/vendor/iconv/libiconv/armscii_8.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/armscii_8.h
rename to vendor/iconv/libiconv/armscii_8.h
diff --git a/aegisub/vendor/iconv/libiconv/ascii.h b/vendor/iconv/libiconv/ascii.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ascii.h
rename to vendor/iconv/libiconv/ascii.h
diff --git a/aegisub/vendor/iconv/libiconv/atarist.h b/vendor/iconv/libiconv/atarist.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/atarist.h
rename to vendor/iconv/libiconv/atarist.h
diff --git a/aegisub/vendor/iconv/libiconv/big5.h b/vendor/iconv/libiconv/big5.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/big5.h
rename to vendor/iconv/libiconv/big5.h
diff --git a/aegisub/vendor/iconv/libiconv/big5_2003.h b/vendor/iconv/libiconv/big5_2003.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/big5_2003.h
rename to vendor/iconv/libiconv/big5_2003.h
diff --git a/aegisub/vendor/iconv/libiconv/big5hkscs1999.h b/vendor/iconv/libiconv/big5hkscs1999.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/big5hkscs1999.h
rename to vendor/iconv/libiconv/big5hkscs1999.h
diff --git a/aegisub/vendor/iconv/libiconv/big5hkscs2001.h b/vendor/iconv/libiconv/big5hkscs2001.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/big5hkscs2001.h
rename to vendor/iconv/libiconv/big5hkscs2001.h
diff --git a/aegisub/vendor/iconv/libiconv/big5hkscs2004.h b/vendor/iconv/libiconv/big5hkscs2004.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/big5hkscs2004.h
rename to vendor/iconv/libiconv/big5hkscs2004.h
diff --git a/aegisub/vendor/iconv/libiconv/c99.h b/vendor/iconv/libiconv/c99.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/c99.h
rename to vendor/iconv/libiconv/c99.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical.h b/vendor/iconv/libiconv/canonical.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical.h
rename to vendor/iconv/libiconv/canonical.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_aix.h b/vendor/iconv/libiconv/canonical_aix.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_aix.h
rename to vendor/iconv/libiconv/canonical_aix.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_aix_sysaix.h b/vendor/iconv/libiconv/canonical_aix_sysaix.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_aix_sysaix.h
rename to vendor/iconv/libiconv/canonical_aix_sysaix.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_dos.h b/vendor/iconv/libiconv/canonical_dos.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_dos.h
rename to vendor/iconv/libiconv/canonical_dos.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_extra.h b/vendor/iconv/libiconv/canonical_extra.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_extra.h
rename to vendor/iconv/libiconv/canonical_extra.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_local.h b/vendor/iconv/libiconv/canonical_local.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_local.h
rename to vendor/iconv/libiconv/canonical_local.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_local_sysaix.h b/vendor/iconv/libiconv/canonical_local_sysaix.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_local_sysaix.h
rename to vendor/iconv/libiconv/canonical_local_sysaix.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_local_syshpux.h b/vendor/iconv/libiconv/canonical_local_syshpux.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_local_syshpux.h
rename to vendor/iconv/libiconv/canonical_local_syshpux.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_local_sysosf1.h b/vendor/iconv/libiconv/canonical_local_sysosf1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_local_sysosf1.h
rename to vendor/iconv/libiconv/canonical_local_sysosf1.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_local_syssolaris.h b/vendor/iconv/libiconv/canonical_local_syssolaris.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_local_syssolaris.h
rename to vendor/iconv/libiconv/canonical_local_syssolaris.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_osf1.h b/vendor/iconv/libiconv/canonical_osf1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_osf1.h
rename to vendor/iconv/libiconv/canonical_osf1.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_osf1_sysosf1.h b/vendor/iconv/libiconv/canonical_osf1_sysosf1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_osf1_sysosf1.h
rename to vendor/iconv/libiconv/canonical_osf1_sysosf1.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_sysaix.h b/vendor/iconv/libiconv/canonical_sysaix.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_sysaix.h
rename to vendor/iconv/libiconv/canonical_sysaix.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_syshpux.h b/vendor/iconv/libiconv/canonical_syshpux.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_syshpux.h
rename to vendor/iconv/libiconv/canonical_syshpux.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_sysosf1.h b/vendor/iconv/libiconv/canonical_sysosf1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_sysosf1.h
rename to vendor/iconv/libiconv/canonical_sysosf1.h
diff --git a/aegisub/vendor/iconv/libiconv/canonical_syssolaris.h b/vendor/iconv/libiconv/canonical_syssolaris.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/canonical_syssolaris.h
rename to vendor/iconv/libiconv/canonical_syssolaris.h
diff --git a/aegisub/vendor/iconv/libiconv/ces_big5.h b/vendor/iconv/libiconv/ces_big5.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ces_big5.h
rename to vendor/iconv/libiconv/ces_big5.h
diff --git a/aegisub/vendor/iconv/libiconv/ces_gbk.h b/vendor/iconv/libiconv/ces_gbk.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ces_gbk.h
rename to vendor/iconv/libiconv/ces_gbk.h
diff --git a/aegisub/vendor/iconv/libiconv/charset.alias b/vendor/iconv/libiconv/charset.alias
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/charset.alias
rename to vendor/iconv/libiconv/charset.alias
diff --git a/aegisub/vendor/iconv/libiconv/cjk_variants.h b/vendor/iconv/libiconv/cjk_variants.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cjk_variants.h
rename to vendor/iconv/libiconv/cjk_variants.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643.h b/vendor/iconv/libiconv/cns11643.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643.h
rename to vendor/iconv/libiconv/cns11643.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_1.h b/vendor/iconv/libiconv/cns11643_1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_1.h
rename to vendor/iconv/libiconv/cns11643_1.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_15.h b/vendor/iconv/libiconv/cns11643_15.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_15.h
rename to vendor/iconv/libiconv/cns11643_15.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_2.h b/vendor/iconv/libiconv/cns11643_2.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_2.h
rename to vendor/iconv/libiconv/cns11643_2.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_3.h b/vendor/iconv/libiconv/cns11643_3.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_3.h
rename to vendor/iconv/libiconv/cns11643_3.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_4.h b/vendor/iconv/libiconv/cns11643_4.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_4.h
rename to vendor/iconv/libiconv/cns11643_4.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_4a.h b/vendor/iconv/libiconv/cns11643_4a.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_4a.h
rename to vendor/iconv/libiconv/cns11643_4a.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_4b.h b/vendor/iconv/libiconv/cns11643_4b.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_4b.h
rename to vendor/iconv/libiconv/cns11643_4b.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_5.h b/vendor/iconv/libiconv/cns11643_5.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_5.h
rename to vendor/iconv/libiconv/cns11643_5.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_6.h b/vendor/iconv/libiconv/cns11643_6.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_6.h
rename to vendor/iconv/libiconv/cns11643_6.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_7.h b/vendor/iconv/libiconv/cns11643_7.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_7.h
rename to vendor/iconv/libiconv/cns11643_7.h
diff --git a/aegisub/vendor/iconv/libiconv/cns11643_inv.h b/vendor/iconv/libiconv/cns11643_inv.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cns11643_inv.h
rename to vendor/iconv/libiconv/cns11643_inv.h
diff --git a/aegisub/vendor/iconv/libiconv/config.h b/vendor/iconv/libiconv/config.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/config.h
rename to vendor/iconv/libiconv/config.h
diff --git a/aegisub/vendor/iconv/libiconv/converters.h b/vendor/iconv/libiconv/converters.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/converters.h
rename to vendor/iconv/libiconv/converters.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1046.h b/vendor/iconv/libiconv/cp1046.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1046.h
rename to vendor/iconv/libiconv/cp1046.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1124.h b/vendor/iconv/libiconv/cp1124.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1124.h
rename to vendor/iconv/libiconv/cp1124.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1125.h b/vendor/iconv/libiconv/cp1125.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1125.h
rename to vendor/iconv/libiconv/cp1125.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1129.h b/vendor/iconv/libiconv/cp1129.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1129.h
rename to vendor/iconv/libiconv/cp1129.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1131.h b/vendor/iconv/libiconv/cp1131.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1131.h
rename to vendor/iconv/libiconv/cp1131.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1133.h b/vendor/iconv/libiconv/cp1133.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1133.h
rename to vendor/iconv/libiconv/cp1133.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1161.h b/vendor/iconv/libiconv/cp1161.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1161.h
rename to vendor/iconv/libiconv/cp1161.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1162.h b/vendor/iconv/libiconv/cp1162.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1162.h
rename to vendor/iconv/libiconv/cp1162.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1163.h b/vendor/iconv/libiconv/cp1163.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1163.h
rename to vendor/iconv/libiconv/cp1163.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1250.h b/vendor/iconv/libiconv/cp1250.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1250.h
rename to vendor/iconv/libiconv/cp1250.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1251.h b/vendor/iconv/libiconv/cp1251.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1251.h
rename to vendor/iconv/libiconv/cp1251.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1252.h b/vendor/iconv/libiconv/cp1252.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1252.h
rename to vendor/iconv/libiconv/cp1252.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1253.h b/vendor/iconv/libiconv/cp1253.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1253.h
rename to vendor/iconv/libiconv/cp1253.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1254.h b/vendor/iconv/libiconv/cp1254.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1254.h
rename to vendor/iconv/libiconv/cp1254.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1255.h b/vendor/iconv/libiconv/cp1255.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1255.h
rename to vendor/iconv/libiconv/cp1255.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1256.h b/vendor/iconv/libiconv/cp1256.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1256.h
rename to vendor/iconv/libiconv/cp1256.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1257.h b/vendor/iconv/libiconv/cp1257.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1257.h
rename to vendor/iconv/libiconv/cp1257.h
diff --git a/aegisub/vendor/iconv/libiconv/cp1258.h b/vendor/iconv/libiconv/cp1258.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp1258.h
rename to vendor/iconv/libiconv/cp1258.h
diff --git a/aegisub/vendor/iconv/libiconv/cp437.h b/vendor/iconv/libiconv/cp437.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp437.h
rename to vendor/iconv/libiconv/cp437.h
diff --git a/aegisub/vendor/iconv/libiconv/cp737.h b/vendor/iconv/libiconv/cp737.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp737.h
rename to vendor/iconv/libiconv/cp737.h
diff --git a/aegisub/vendor/iconv/libiconv/cp775.h b/vendor/iconv/libiconv/cp775.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp775.h
rename to vendor/iconv/libiconv/cp775.h
diff --git a/aegisub/vendor/iconv/libiconv/cp850.h b/vendor/iconv/libiconv/cp850.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp850.h
rename to vendor/iconv/libiconv/cp850.h
diff --git a/aegisub/vendor/iconv/libiconv/cp852.h b/vendor/iconv/libiconv/cp852.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp852.h
rename to vendor/iconv/libiconv/cp852.h
diff --git a/aegisub/vendor/iconv/libiconv/cp853.h b/vendor/iconv/libiconv/cp853.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp853.h
rename to vendor/iconv/libiconv/cp853.h
diff --git a/aegisub/vendor/iconv/libiconv/cp855.h b/vendor/iconv/libiconv/cp855.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp855.h
rename to vendor/iconv/libiconv/cp855.h
diff --git a/aegisub/vendor/iconv/libiconv/cp856.h b/vendor/iconv/libiconv/cp856.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp856.h
rename to vendor/iconv/libiconv/cp856.h
diff --git a/aegisub/vendor/iconv/libiconv/cp857.h b/vendor/iconv/libiconv/cp857.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp857.h
rename to vendor/iconv/libiconv/cp857.h
diff --git a/aegisub/vendor/iconv/libiconv/cp858.h b/vendor/iconv/libiconv/cp858.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp858.h
rename to vendor/iconv/libiconv/cp858.h
diff --git a/aegisub/vendor/iconv/libiconv/cp860.h b/vendor/iconv/libiconv/cp860.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp860.h
rename to vendor/iconv/libiconv/cp860.h
diff --git a/aegisub/vendor/iconv/libiconv/cp861.h b/vendor/iconv/libiconv/cp861.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp861.h
rename to vendor/iconv/libiconv/cp861.h
diff --git a/aegisub/vendor/iconv/libiconv/cp862.h b/vendor/iconv/libiconv/cp862.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp862.h
rename to vendor/iconv/libiconv/cp862.h
diff --git a/aegisub/vendor/iconv/libiconv/cp863.h b/vendor/iconv/libiconv/cp863.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp863.h
rename to vendor/iconv/libiconv/cp863.h
diff --git a/aegisub/vendor/iconv/libiconv/cp864.h b/vendor/iconv/libiconv/cp864.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp864.h
rename to vendor/iconv/libiconv/cp864.h
diff --git a/aegisub/vendor/iconv/libiconv/cp865.h b/vendor/iconv/libiconv/cp865.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp865.h
rename to vendor/iconv/libiconv/cp865.h
diff --git a/aegisub/vendor/iconv/libiconv/cp866.h b/vendor/iconv/libiconv/cp866.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp866.h
rename to vendor/iconv/libiconv/cp866.h
diff --git a/aegisub/vendor/iconv/libiconv/cp869.h b/vendor/iconv/libiconv/cp869.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp869.h
rename to vendor/iconv/libiconv/cp869.h
diff --git a/aegisub/vendor/iconv/libiconv/cp874.h b/vendor/iconv/libiconv/cp874.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp874.h
rename to vendor/iconv/libiconv/cp874.h
diff --git a/aegisub/vendor/iconv/libiconv/cp922.h b/vendor/iconv/libiconv/cp922.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp922.h
rename to vendor/iconv/libiconv/cp922.h
diff --git a/aegisub/vendor/iconv/libiconv/cp932.h b/vendor/iconv/libiconv/cp932.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp932.h
rename to vendor/iconv/libiconv/cp932.h
diff --git a/aegisub/vendor/iconv/libiconv/cp932ext.h b/vendor/iconv/libiconv/cp932ext.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp932ext.h
rename to vendor/iconv/libiconv/cp932ext.h
diff --git a/aegisub/vendor/iconv/libiconv/cp936.h b/vendor/iconv/libiconv/cp936.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp936.h
rename to vendor/iconv/libiconv/cp936.h
diff --git a/aegisub/vendor/iconv/libiconv/cp936ext.h b/vendor/iconv/libiconv/cp936ext.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp936ext.h
rename to vendor/iconv/libiconv/cp936ext.h
diff --git a/aegisub/vendor/iconv/libiconv/cp943.h b/vendor/iconv/libiconv/cp943.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp943.h
rename to vendor/iconv/libiconv/cp943.h
diff --git a/aegisub/vendor/iconv/libiconv/cp949.h b/vendor/iconv/libiconv/cp949.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp949.h
rename to vendor/iconv/libiconv/cp949.h
diff --git a/aegisub/vendor/iconv/libiconv/cp950.h b/vendor/iconv/libiconv/cp950.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp950.h
rename to vendor/iconv/libiconv/cp950.h
diff --git a/aegisub/vendor/iconv/libiconv/cp950ext.h b/vendor/iconv/libiconv/cp950ext.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/cp950ext.h
rename to vendor/iconv/libiconv/cp950ext.h
diff --git a/aegisub/vendor/iconv/libiconv/dec_hanyu.h b/vendor/iconv/libiconv/dec_hanyu.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/dec_hanyu.h
rename to vendor/iconv/libiconv/dec_hanyu.h
diff --git a/aegisub/vendor/iconv/libiconv/dec_kanji.h b/vendor/iconv/libiconv/dec_kanji.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/dec_kanji.h
rename to vendor/iconv/libiconv/dec_kanji.h
diff --git a/aegisub/vendor/iconv/libiconv/encodings.def b/vendor/iconv/libiconv/encodings.def
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/encodings.def
rename to vendor/iconv/libiconv/encodings.def
diff --git a/aegisub/vendor/iconv/libiconv/encodings_aix.def b/vendor/iconv/libiconv/encodings_aix.def
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/encodings_aix.def
rename to vendor/iconv/libiconv/encodings_aix.def
diff --git a/aegisub/vendor/iconv/libiconv/encodings_dos.def b/vendor/iconv/libiconv/encodings_dos.def
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/encodings_dos.def
rename to vendor/iconv/libiconv/encodings_dos.def
diff --git a/aegisub/vendor/iconv/libiconv/encodings_extra.def b/vendor/iconv/libiconv/encodings_extra.def
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/encodings_extra.def
rename to vendor/iconv/libiconv/encodings_extra.def
diff --git a/aegisub/vendor/iconv/libiconv/encodings_local.def b/vendor/iconv/libiconv/encodings_local.def
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/encodings_local.def
rename to vendor/iconv/libiconv/encodings_local.def
diff --git a/aegisub/vendor/iconv/libiconv/encodings_osf1.def b/vendor/iconv/libiconv/encodings_osf1.def
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/encodings_osf1.def
rename to vendor/iconv/libiconv/encodings_osf1.def
diff --git a/aegisub/vendor/iconv/libiconv/euc_cn.h b/vendor/iconv/libiconv/euc_cn.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/euc_cn.h
rename to vendor/iconv/libiconv/euc_cn.h
diff --git a/aegisub/vendor/iconv/libiconv/euc_jisx0213.h b/vendor/iconv/libiconv/euc_jisx0213.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/euc_jisx0213.h
rename to vendor/iconv/libiconv/euc_jisx0213.h
diff --git a/aegisub/vendor/iconv/libiconv/euc_jp.h b/vendor/iconv/libiconv/euc_jp.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/euc_jp.h
rename to vendor/iconv/libiconv/euc_jp.h
diff --git a/aegisub/vendor/iconv/libiconv/euc_kr.h b/vendor/iconv/libiconv/euc_kr.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/euc_kr.h
rename to vendor/iconv/libiconv/euc_kr.h
diff --git a/aegisub/vendor/iconv/libiconv/euc_tw.h b/vendor/iconv/libiconv/euc_tw.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/euc_tw.h
rename to vendor/iconv/libiconv/euc_tw.h
diff --git a/aegisub/vendor/iconv/libiconv/flags.h b/vendor/iconv/libiconv/flags.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/flags.h
rename to vendor/iconv/libiconv/flags.h
diff --git a/aegisub/vendor/iconv/libiconv/flushwc.h b/vendor/iconv/libiconv/flushwc.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/flushwc.h
rename to vendor/iconv/libiconv/flushwc.h
diff --git a/aegisub/vendor/iconv/libiconv/gb12345.h b/vendor/iconv/libiconv/gb12345.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gb12345.h
rename to vendor/iconv/libiconv/gb12345.h
diff --git a/aegisub/vendor/iconv/libiconv/gb12345ext.h b/vendor/iconv/libiconv/gb12345ext.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gb12345ext.h
rename to vendor/iconv/libiconv/gb12345ext.h
diff --git a/aegisub/vendor/iconv/libiconv/gb18030.h b/vendor/iconv/libiconv/gb18030.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gb18030.h
rename to vendor/iconv/libiconv/gb18030.h
diff --git a/aegisub/vendor/iconv/libiconv/gb18030ext.h b/vendor/iconv/libiconv/gb18030ext.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gb18030ext.h
rename to vendor/iconv/libiconv/gb18030ext.h
diff --git a/aegisub/vendor/iconv/libiconv/gb18030uni.h b/vendor/iconv/libiconv/gb18030uni.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gb18030uni.h
rename to vendor/iconv/libiconv/gb18030uni.h
diff --git a/aegisub/vendor/iconv/libiconv/gb2312.h b/vendor/iconv/libiconv/gb2312.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gb2312.h
rename to vendor/iconv/libiconv/gb2312.h
diff --git a/aegisub/vendor/iconv/libiconv/gbk.h b/vendor/iconv/libiconv/gbk.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gbk.h
rename to vendor/iconv/libiconv/gbk.h
diff --git a/aegisub/vendor/iconv/libiconv/gbkext1.h b/vendor/iconv/libiconv/gbkext1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gbkext1.h
rename to vendor/iconv/libiconv/gbkext1.h
diff --git a/aegisub/vendor/iconv/libiconv/gbkext2.h b/vendor/iconv/libiconv/gbkext2.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gbkext2.h
rename to vendor/iconv/libiconv/gbkext2.h
diff --git a/aegisub/vendor/iconv/libiconv/gbkext_inv.h b/vendor/iconv/libiconv/gbkext_inv.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gbkext_inv.h
rename to vendor/iconv/libiconv/gbkext_inv.h
diff --git a/aegisub/vendor/iconv/libiconv/genaliases.c b/vendor/iconv/libiconv/genaliases.c
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/genaliases.c
rename to vendor/iconv/libiconv/genaliases.c
diff --git a/aegisub/vendor/iconv/libiconv/genaliases2.c b/vendor/iconv/libiconv/genaliases2.c
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/genaliases2.c
rename to vendor/iconv/libiconv/genaliases2.c
diff --git a/aegisub/vendor/iconv/libiconv/genflags.c b/vendor/iconv/libiconv/genflags.c
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/genflags.c
rename to vendor/iconv/libiconv/genflags.c
diff --git a/aegisub/vendor/iconv/libiconv/gentranslit.c b/vendor/iconv/libiconv/gentranslit.c
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/gentranslit.c
rename to vendor/iconv/libiconv/gentranslit.c
diff --git a/aegisub/vendor/iconv/libiconv/georgian_academy.h b/vendor/iconv/libiconv/georgian_academy.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/georgian_academy.h
rename to vendor/iconv/libiconv/georgian_academy.h
diff --git a/aegisub/vendor/iconv/libiconv/georgian_ps.h b/vendor/iconv/libiconv/georgian_ps.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/georgian_ps.h
rename to vendor/iconv/libiconv/georgian_ps.h
diff --git a/aegisub/vendor/iconv/libiconv/hkscs1999.h b/vendor/iconv/libiconv/hkscs1999.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/hkscs1999.h
rename to vendor/iconv/libiconv/hkscs1999.h
diff --git a/aegisub/vendor/iconv/libiconv/hkscs2001.h b/vendor/iconv/libiconv/hkscs2001.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/hkscs2001.h
rename to vendor/iconv/libiconv/hkscs2001.h
diff --git a/aegisub/vendor/iconv/libiconv/hkscs2004.h b/vendor/iconv/libiconv/hkscs2004.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/hkscs2004.h
rename to vendor/iconv/libiconv/hkscs2004.h
diff --git a/aegisub/vendor/iconv/libiconv/hp_roman8.h b/vendor/iconv/libiconv/hp_roman8.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/hp_roman8.h
rename to vendor/iconv/libiconv/hp_roman8.h
diff --git a/aegisub/vendor/iconv/libiconv/hz.h b/vendor/iconv/libiconv/hz.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/hz.h
rename to vendor/iconv/libiconv/hz.h
diff --git a/aegisub/vendor/iconv/libiconv/iconv.c b/vendor/iconv/libiconv/iconv.c
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iconv.c
rename to vendor/iconv/libiconv/iconv.c
diff --git a/aegisub/vendor/iconv/libiconv/iconv_open1.h b/vendor/iconv/libiconv/iconv_open1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iconv_open1.h
rename to vendor/iconv/libiconv/iconv_open1.h
diff --git a/aegisub/vendor/iconv/libiconv/iconv_open2.h b/vendor/iconv/libiconv/iconv_open2.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iconv_open2.h
rename to vendor/iconv/libiconv/iconv_open2.h
diff --git a/aegisub/vendor/iconv/libiconv/iso2022_cn.h b/vendor/iconv/libiconv/iso2022_cn.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso2022_cn.h
rename to vendor/iconv/libiconv/iso2022_cn.h
diff --git a/aegisub/vendor/iconv/libiconv/iso2022_cnext.h b/vendor/iconv/libiconv/iso2022_cnext.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso2022_cnext.h
rename to vendor/iconv/libiconv/iso2022_cnext.h
diff --git a/aegisub/vendor/iconv/libiconv/iso2022_jp.h b/vendor/iconv/libiconv/iso2022_jp.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso2022_jp.h
rename to vendor/iconv/libiconv/iso2022_jp.h
diff --git a/aegisub/vendor/iconv/libiconv/iso2022_jp1.h b/vendor/iconv/libiconv/iso2022_jp1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso2022_jp1.h
rename to vendor/iconv/libiconv/iso2022_jp1.h
diff --git a/aegisub/vendor/iconv/libiconv/iso2022_jp2.h b/vendor/iconv/libiconv/iso2022_jp2.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso2022_jp2.h
rename to vendor/iconv/libiconv/iso2022_jp2.h
diff --git a/aegisub/vendor/iconv/libiconv/iso2022_jp3.h b/vendor/iconv/libiconv/iso2022_jp3.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso2022_jp3.h
rename to vendor/iconv/libiconv/iso2022_jp3.h
diff --git a/aegisub/vendor/iconv/libiconv/iso2022_kr.h b/vendor/iconv/libiconv/iso2022_kr.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso2022_kr.h
rename to vendor/iconv/libiconv/iso2022_kr.h
diff --git a/aegisub/vendor/iconv/libiconv/iso646_cn.h b/vendor/iconv/libiconv/iso646_cn.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso646_cn.h
rename to vendor/iconv/libiconv/iso646_cn.h
diff --git a/aegisub/vendor/iconv/libiconv/iso646_jp.h b/vendor/iconv/libiconv/iso646_jp.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso646_jp.h
rename to vendor/iconv/libiconv/iso646_jp.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_1.h b/vendor/iconv/libiconv/iso8859_1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_1.h
rename to vendor/iconv/libiconv/iso8859_1.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_10.h b/vendor/iconv/libiconv/iso8859_10.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_10.h
rename to vendor/iconv/libiconv/iso8859_10.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_11.h b/vendor/iconv/libiconv/iso8859_11.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_11.h
rename to vendor/iconv/libiconv/iso8859_11.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_13.h b/vendor/iconv/libiconv/iso8859_13.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_13.h
rename to vendor/iconv/libiconv/iso8859_13.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_14.h b/vendor/iconv/libiconv/iso8859_14.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_14.h
rename to vendor/iconv/libiconv/iso8859_14.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_15.h b/vendor/iconv/libiconv/iso8859_15.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_15.h
rename to vendor/iconv/libiconv/iso8859_15.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_16.h b/vendor/iconv/libiconv/iso8859_16.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_16.h
rename to vendor/iconv/libiconv/iso8859_16.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_2.h b/vendor/iconv/libiconv/iso8859_2.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_2.h
rename to vendor/iconv/libiconv/iso8859_2.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_3.h b/vendor/iconv/libiconv/iso8859_3.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_3.h
rename to vendor/iconv/libiconv/iso8859_3.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_4.h b/vendor/iconv/libiconv/iso8859_4.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_4.h
rename to vendor/iconv/libiconv/iso8859_4.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_5.h b/vendor/iconv/libiconv/iso8859_5.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_5.h
rename to vendor/iconv/libiconv/iso8859_5.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_6.h b/vendor/iconv/libiconv/iso8859_6.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_6.h
rename to vendor/iconv/libiconv/iso8859_6.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_7.h b/vendor/iconv/libiconv/iso8859_7.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_7.h
rename to vendor/iconv/libiconv/iso8859_7.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_8.h b/vendor/iconv/libiconv/iso8859_8.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_8.h
rename to vendor/iconv/libiconv/iso8859_8.h
diff --git a/aegisub/vendor/iconv/libiconv/iso8859_9.h b/vendor/iconv/libiconv/iso8859_9.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/iso8859_9.h
rename to vendor/iconv/libiconv/iso8859_9.h
diff --git a/aegisub/vendor/iconv/libiconv/isoir165.h b/vendor/iconv/libiconv/isoir165.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/isoir165.h
rename to vendor/iconv/libiconv/isoir165.h
diff --git a/aegisub/vendor/iconv/libiconv/isoir165ext.h b/vendor/iconv/libiconv/isoir165ext.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/isoir165ext.h
rename to vendor/iconv/libiconv/isoir165ext.h
diff --git a/aegisub/vendor/iconv/libiconv/java.h b/vendor/iconv/libiconv/java.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/java.h
rename to vendor/iconv/libiconv/java.h
diff --git a/aegisub/vendor/iconv/libiconv/jisx0201.h b/vendor/iconv/libiconv/jisx0201.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/jisx0201.h
rename to vendor/iconv/libiconv/jisx0201.h
diff --git a/aegisub/vendor/iconv/libiconv/jisx0208.h b/vendor/iconv/libiconv/jisx0208.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/jisx0208.h
rename to vendor/iconv/libiconv/jisx0208.h
diff --git a/aegisub/vendor/iconv/libiconv/jisx0212.h b/vendor/iconv/libiconv/jisx0212.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/jisx0212.h
rename to vendor/iconv/libiconv/jisx0212.h
diff --git a/aegisub/vendor/iconv/libiconv/jisx0213.h b/vendor/iconv/libiconv/jisx0213.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/jisx0213.h
rename to vendor/iconv/libiconv/jisx0213.h
diff --git a/aegisub/vendor/iconv/libiconv/johab.h b/vendor/iconv/libiconv/johab.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/johab.h
rename to vendor/iconv/libiconv/johab.h
diff --git a/aegisub/vendor/iconv/libiconv/johab_hangul.h b/vendor/iconv/libiconv/johab_hangul.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/johab_hangul.h
rename to vendor/iconv/libiconv/johab_hangul.h
diff --git a/aegisub/vendor/iconv/libiconv/koi8_r.h b/vendor/iconv/libiconv/koi8_r.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/koi8_r.h
rename to vendor/iconv/libiconv/koi8_r.h
diff --git a/aegisub/vendor/iconv/libiconv/koi8_ru.h b/vendor/iconv/libiconv/koi8_ru.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/koi8_ru.h
rename to vendor/iconv/libiconv/koi8_ru.h
diff --git a/aegisub/vendor/iconv/libiconv/koi8_t.h b/vendor/iconv/libiconv/koi8_t.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/koi8_t.h
rename to vendor/iconv/libiconv/koi8_t.h
diff --git a/aegisub/vendor/iconv/libiconv/koi8_u.h b/vendor/iconv/libiconv/koi8_u.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/koi8_u.h
rename to vendor/iconv/libiconv/koi8_u.h
diff --git a/aegisub/vendor/iconv/libiconv/ksc5601.h b/vendor/iconv/libiconv/ksc5601.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ksc5601.h
rename to vendor/iconv/libiconv/ksc5601.h
diff --git a/aegisub/vendor/iconv/libiconv/libcharset.h b/vendor/iconv/libiconv/libcharset.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/libcharset.h
rename to vendor/iconv/libiconv/libcharset.h
diff --git a/aegisub/vendor/iconv/libiconv/localcharset.h b/vendor/iconv/libiconv/localcharset.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/localcharset.h
rename to vendor/iconv/libiconv/localcharset.h
diff --git a/aegisub/vendor/iconv/libiconv/loop_unicode.h b/vendor/iconv/libiconv/loop_unicode.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/loop_unicode.h
rename to vendor/iconv/libiconv/loop_unicode.h
diff --git a/aegisub/vendor/iconv/libiconv/loop_wchar.h b/vendor/iconv/libiconv/loop_wchar.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/loop_wchar.h
rename to vendor/iconv/libiconv/loop_wchar.h
diff --git a/aegisub/vendor/iconv/libiconv/loops.h b/vendor/iconv/libiconv/loops.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/loops.h
rename to vendor/iconv/libiconv/loops.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_arabic.h b/vendor/iconv/libiconv/mac_arabic.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_arabic.h
rename to vendor/iconv/libiconv/mac_arabic.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_centraleurope.h b/vendor/iconv/libiconv/mac_centraleurope.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_centraleurope.h
rename to vendor/iconv/libiconv/mac_centraleurope.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_croatian.h b/vendor/iconv/libiconv/mac_croatian.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_croatian.h
rename to vendor/iconv/libiconv/mac_croatian.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_cyrillic.h b/vendor/iconv/libiconv/mac_cyrillic.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_cyrillic.h
rename to vendor/iconv/libiconv/mac_cyrillic.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_greek.h b/vendor/iconv/libiconv/mac_greek.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_greek.h
rename to vendor/iconv/libiconv/mac_greek.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_hebrew.h b/vendor/iconv/libiconv/mac_hebrew.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_hebrew.h
rename to vendor/iconv/libiconv/mac_hebrew.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_iceland.h b/vendor/iconv/libiconv/mac_iceland.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_iceland.h
rename to vendor/iconv/libiconv/mac_iceland.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_roman.h b/vendor/iconv/libiconv/mac_roman.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_roman.h
rename to vendor/iconv/libiconv/mac_roman.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_romania.h b/vendor/iconv/libiconv/mac_romania.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_romania.h
rename to vendor/iconv/libiconv/mac_romania.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_thai.h b/vendor/iconv/libiconv/mac_thai.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_thai.h
rename to vendor/iconv/libiconv/mac_thai.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_turkish.h b/vendor/iconv/libiconv/mac_turkish.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_turkish.h
rename to vendor/iconv/libiconv/mac_turkish.h
diff --git a/aegisub/vendor/iconv/libiconv/mac_ukraine.h b/vendor/iconv/libiconv/mac_ukraine.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mac_ukraine.h
rename to vendor/iconv/libiconv/mac_ukraine.h
diff --git a/aegisub/vendor/iconv/libiconv/mulelao.h b/vendor/iconv/libiconv/mulelao.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/mulelao.h
rename to vendor/iconv/libiconv/mulelao.h
diff --git a/aegisub/vendor/iconv/libiconv/nextstep.h b/vendor/iconv/libiconv/nextstep.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/nextstep.h
rename to vendor/iconv/libiconv/nextstep.h
diff --git a/aegisub/vendor/iconv/libiconv/pt154.h b/vendor/iconv/libiconv/pt154.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/pt154.h
rename to vendor/iconv/libiconv/pt154.h
diff --git a/aegisub/vendor/iconv/libiconv/relocatable.c b/vendor/iconv/libiconv/relocatable.c
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/relocatable.c
rename to vendor/iconv/libiconv/relocatable.c
diff --git a/aegisub/vendor/iconv/libiconv/relocatable.h b/vendor/iconv/libiconv/relocatable.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/relocatable.h
rename to vendor/iconv/libiconv/relocatable.h
diff --git a/aegisub/vendor/iconv/libiconv/riscos1.h b/vendor/iconv/libiconv/riscos1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/riscos1.h
rename to vendor/iconv/libiconv/riscos1.h
diff --git a/aegisub/vendor/iconv/libiconv/rk1048.h b/vendor/iconv/libiconv/rk1048.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/rk1048.h
rename to vendor/iconv/libiconv/rk1048.h
diff --git a/aegisub/vendor/iconv/libiconv/shift_jisx0213.h b/vendor/iconv/libiconv/shift_jisx0213.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/shift_jisx0213.h
rename to vendor/iconv/libiconv/shift_jisx0213.h
diff --git a/aegisub/vendor/iconv/libiconv/sjis.h b/vendor/iconv/libiconv/sjis.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/sjis.h
rename to vendor/iconv/libiconv/sjis.h
diff --git a/aegisub/vendor/iconv/libiconv/tcvn.h b/vendor/iconv/libiconv/tcvn.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/tcvn.h
rename to vendor/iconv/libiconv/tcvn.h
diff --git a/aegisub/vendor/iconv/libiconv/tds565.h b/vendor/iconv/libiconv/tds565.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/tds565.h
rename to vendor/iconv/libiconv/tds565.h
diff --git a/aegisub/vendor/iconv/libiconv/tis620.h b/vendor/iconv/libiconv/tis620.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/tis620.h
rename to vendor/iconv/libiconv/tis620.h
diff --git a/aegisub/vendor/iconv/libiconv/translit.h b/vendor/iconv/libiconv/translit.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/translit.h
rename to vendor/iconv/libiconv/translit.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs2.h b/vendor/iconv/libiconv/ucs2.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs2.h
rename to vendor/iconv/libiconv/ucs2.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs2be.h b/vendor/iconv/libiconv/ucs2be.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs2be.h
rename to vendor/iconv/libiconv/ucs2be.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs2internal.h b/vendor/iconv/libiconv/ucs2internal.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs2internal.h
rename to vendor/iconv/libiconv/ucs2internal.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs2le.h b/vendor/iconv/libiconv/ucs2le.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs2le.h
rename to vendor/iconv/libiconv/ucs2le.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs2swapped.h b/vendor/iconv/libiconv/ucs2swapped.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs2swapped.h
rename to vendor/iconv/libiconv/ucs2swapped.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs4.h b/vendor/iconv/libiconv/ucs4.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs4.h
rename to vendor/iconv/libiconv/ucs4.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs4be.h b/vendor/iconv/libiconv/ucs4be.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs4be.h
rename to vendor/iconv/libiconv/ucs4be.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs4internal.h b/vendor/iconv/libiconv/ucs4internal.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs4internal.h
rename to vendor/iconv/libiconv/ucs4internal.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs4le.h b/vendor/iconv/libiconv/ucs4le.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs4le.h
rename to vendor/iconv/libiconv/ucs4le.h
diff --git a/aegisub/vendor/iconv/libiconv/ucs4swapped.h b/vendor/iconv/libiconv/ucs4swapped.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/ucs4swapped.h
rename to vendor/iconv/libiconv/ucs4swapped.h
diff --git a/aegisub/vendor/iconv/libiconv/uhc_1.h b/vendor/iconv/libiconv/uhc_1.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/uhc_1.h
rename to vendor/iconv/libiconv/uhc_1.h
diff --git a/aegisub/vendor/iconv/libiconv/uhc_2.h b/vendor/iconv/libiconv/uhc_2.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/uhc_2.h
rename to vendor/iconv/libiconv/uhc_2.h
diff --git a/aegisub/vendor/iconv/libiconv/utf16.h b/vendor/iconv/libiconv/utf16.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/utf16.h
rename to vendor/iconv/libiconv/utf16.h
diff --git a/aegisub/vendor/iconv/libiconv/utf16be.h b/vendor/iconv/libiconv/utf16be.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/utf16be.h
rename to vendor/iconv/libiconv/utf16be.h
diff --git a/aegisub/vendor/iconv/libiconv/utf16le.h b/vendor/iconv/libiconv/utf16le.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/utf16le.h
rename to vendor/iconv/libiconv/utf16le.h
diff --git a/aegisub/vendor/iconv/libiconv/utf32.h b/vendor/iconv/libiconv/utf32.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/utf32.h
rename to vendor/iconv/libiconv/utf32.h
diff --git a/aegisub/vendor/iconv/libiconv/utf32be.h b/vendor/iconv/libiconv/utf32be.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/utf32be.h
rename to vendor/iconv/libiconv/utf32be.h
diff --git a/aegisub/vendor/iconv/libiconv/utf32le.h b/vendor/iconv/libiconv/utf32le.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/utf32le.h
rename to vendor/iconv/libiconv/utf32le.h
diff --git a/aegisub/vendor/iconv/libiconv/utf7.h b/vendor/iconv/libiconv/utf7.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/utf7.h
rename to vendor/iconv/libiconv/utf7.h
diff --git a/aegisub/vendor/iconv/libiconv/utf8.h b/vendor/iconv/libiconv/utf8.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/utf8.h
rename to vendor/iconv/libiconv/utf8.h
diff --git a/aegisub/vendor/iconv/libiconv/vietcomb.h b/vendor/iconv/libiconv/vietcomb.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/vietcomb.h
rename to vendor/iconv/libiconv/vietcomb.h
diff --git a/aegisub/vendor/iconv/libiconv/viscii.h b/vendor/iconv/libiconv/viscii.h
similarity index 100%
rename from aegisub/vendor/iconv/libiconv/viscii.h
rename to vendor/iconv/libiconv/viscii.h
diff --git a/aegisub/vendor/icu b/vendor/icu
similarity index 100%
rename from aegisub/vendor/icu
rename to vendor/icu
diff --git a/aegisub/vendor/libass b/vendor/libass
similarity index 100%
rename from aegisub/vendor/libass
rename to vendor/libass
diff --git a/aegisub/vendor/lua b/vendor/lua
similarity index 100%
rename from aegisub/vendor/lua
rename to vendor/lua
diff --git a/aegisub/vendor/universalchardet/Big5Freq.tab b/vendor/universalchardet/Big5Freq.tab
similarity index 100%
rename from aegisub/vendor/universalchardet/Big5Freq.tab
rename to vendor/universalchardet/Big5Freq.tab
diff --git a/aegisub/vendor/universalchardet/CharDistribution.cpp b/vendor/universalchardet/CharDistribution.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/CharDistribution.cpp
rename to vendor/universalchardet/CharDistribution.cpp
diff --git a/aegisub/vendor/universalchardet/CharDistribution.h b/vendor/universalchardet/CharDistribution.h
similarity index 100%
rename from aegisub/vendor/universalchardet/CharDistribution.h
rename to vendor/universalchardet/CharDistribution.h
diff --git a/aegisub/vendor/universalchardet/EUCKRFreq.tab b/vendor/universalchardet/EUCKRFreq.tab
similarity index 100%
rename from aegisub/vendor/universalchardet/EUCKRFreq.tab
rename to vendor/universalchardet/EUCKRFreq.tab
diff --git a/aegisub/vendor/universalchardet/EUCTWFreq.tab b/vendor/universalchardet/EUCTWFreq.tab
similarity index 100%
rename from aegisub/vendor/universalchardet/EUCTWFreq.tab
rename to vendor/universalchardet/EUCTWFreq.tab
diff --git a/aegisub/vendor/universalchardet/GB2312Freq.tab b/vendor/universalchardet/GB2312Freq.tab
similarity index 100%
rename from aegisub/vendor/universalchardet/GB2312Freq.tab
rename to vendor/universalchardet/GB2312Freq.tab
diff --git a/aegisub/vendor/universalchardet/JISFreq.tab b/vendor/universalchardet/JISFreq.tab
similarity index 100%
rename from aegisub/vendor/universalchardet/JISFreq.tab
rename to vendor/universalchardet/JISFreq.tab
diff --git a/aegisub/vendor/universalchardet/JpCntx.cpp b/vendor/universalchardet/JpCntx.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/JpCntx.cpp
rename to vendor/universalchardet/JpCntx.cpp
diff --git a/aegisub/vendor/universalchardet/JpCntx.h b/vendor/universalchardet/JpCntx.h
similarity index 100%
rename from aegisub/vendor/universalchardet/JpCntx.h
rename to vendor/universalchardet/JpCntx.h
diff --git a/aegisub/vendor/universalchardet/LangBulgarianModel.cpp b/vendor/universalchardet/LangBulgarianModel.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/LangBulgarianModel.cpp
rename to vendor/universalchardet/LangBulgarianModel.cpp
diff --git a/aegisub/vendor/universalchardet/LangCyrillicModel.cpp b/vendor/universalchardet/LangCyrillicModel.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/LangCyrillicModel.cpp
rename to vendor/universalchardet/LangCyrillicModel.cpp
diff --git a/aegisub/vendor/universalchardet/LangGreekModel.cpp b/vendor/universalchardet/LangGreekModel.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/LangGreekModel.cpp
rename to vendor/universalchardet/LangGreekModel.cpp
diff --git a/aegisub/vendor/universalchardet/LangHebrewModel.cpp b/vendor/universalchardet/LangHebrewModel.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/LangHebrewModel.cpp
rename to vendor/universalchardet/LangHebrewModel.cpp
diff --git a/aegisub/vendor/universalchardet/LangHungarianModel.cpp b/vendor/universalchardet/LangHungarianModel.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/LangHungarianModel.cpp
rename to vendor/universalchardet/LangHungarianModel.cpp
diff --git a/aegisub/vendor/universalchardet/LangThaiModel.cpp b/vendor/universalchardet/LangThaiModel.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/LangThaiModel.cpp
rename to vendor/universalchardet/LangThaiModel.cpp
diff --git a/aegisub/vendor/universalchardet/Makefile b/vendor/universalchardet/Makefile
similarity index 100%
rename from aegisub/vendor/universalchardet/Makefile
rename to vendor/universalchardet/Makefile
diff --git a/aegisub/vendor/universalchardet/md/_aix32.cfg b/vendor/universalchardet/md/_aix32.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_aix32.cfg
rename to vendor/universalchardet/md/_aix32.cfg
diff --git a/aegisub/vendor/universalchardet/md/_aix64.cfg b/vendor/universalchardet/md/_aix64.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_aix64.cfg
rename to vendor/universalchardet/md/_aix64.cfg
diff --git a/aegisub/vendor/universalchardet/md/_beos.cfg b/vendor/universalchardet/md/_beos.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_beos.cfg
rename to vendor/universalchardet/md/_beos.cfg
diff --git a/aegisub/vendor/universalchardet/md/_bsdi.cfg b/vendor/universalchardet/md/_bsdi.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_bsdi.cfg
rename to vendor/universalchardet/md/_bsdi.cfg
diff --git a/aegisub/vendor/universalchardet/md/_darwin.cfg b/vendor/universalchardet/md/_darwin.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_darwin.cfg
rename to vendor/universalchardet/md/_darwin.cfg
diff --git a/aegisub/vendor/universalchardet/md/_dgux.cfg b/vendor/universalchardet/md/_dgux.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_dgux.cfg
rename to vendor/universalchardet/md/_dgux.cfg
diff --git a/aegisub/vendor/universalchardet/md/_freebsd.cfg b/vendor/universalchardet/md/_freebsd.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_freebsd.cfg
rename to vendor/universalchardet/md/_freebsd.cfg
diff --git a/aegisub/vendor/universalchardet/md/_hpux32.cfg b/vendor/universalchardet/md/_hpux32.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_hpux32.cfg
rename to vendor/universalchardet/md/_hpux32.cfg
diff --git a/aegisub/vendor/universalchardet/md/_hpux64.cfg b/vendor/universalchardet/md/_hpux64.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_hpux64.cfg
rename to vendor/universalchardet/md/_hpux64.cfg
diff --git a/aegisub/vendor/universalchardet/md/_irix32.cfg b/vendor/universalchardet/md/_irix32.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_irix32.cfg
rename to vendor/universalchardet/md/_irix32.cfg
diff --git a/aegisub/vendor/universalchardet/md/_irix64.cfg b/vendor/universalchardet/md/_irix64.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_irix64.cfg
rename to vendor/universalchardet/md/_irix64.cfg
diff --git a/aegisub/vendor/universalchardet/md/_linux.cfg b/vendor/universalchardet/md/_linux.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_linux.cfg
rename to vendor/universalchardet/md/_linux.cfg
diff --git a/aegisub/vendor/universalchardet/md/_ncr.cfg b/vendor/universalchardet/md/_ncr.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_ncr.cfg
rename to vendor/universalchardet/md/_ncr.cfg
diff --git a/aegisub/vendor/universalchardet/md/_nec.cfg b/vendor/universalchardet/md/_nec.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_nec.cfg
rename to vendor/universalchardet/md/_nec.cfg
diff --git a/aegisub/vendor/universalchardet/md/_netbsd.cfg b/vendor/universalchardet/md/_netbsd.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_netbsd.cfg
rename to vendor/universalchardet/md/_netbsd.cfg
diff --git a/aegisub/vendor/universalchardet/md/_nextstep.cfg b/vendor/universalchardet/md/_nextstep.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_nextstep.cfg
rename to vendor/universalchardet/md/_nextstep.cfg
diff --git a/aegisub/vendor/universalchardet/md/_nto.cfg b/vendor/universalchardet/md/_nto.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_nto.cfg
rename to vendor/universalchardet/md/_nto.cfg
diff --git a/aegisub/vendor/universalchardet/md/_openbsd.cfg b/vendor/universalchardet/md/_openbsd.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_openbsd.cfg
rename to vendor/universalchardet/md/_openbsd.cfg
diff --git a/aegisub/vendor/universalchardet/md/_openvms.cfg b/vendor/universalchardet/md/_openvms.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_openvms.cfg
rename to vendor/universalchardet/md/_openvms.cfg
diff --git a/aegisub/vendor/universalchardet/md/_os2.cfg b/vendor/universalchardet/md/_os2.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_os2.cfg
rename to vendor/universalchardet/md/_os2.cfg
diff --git a/aegisub/vendor/universalchardet/md/_osf1.cfg b/vendor/universalchardet/md/_osf1.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_osf1.cfg
rename to vendor/universalchardet/md/_osf1.cfg
diff --git a/aegisub/vendor/universalchardet/md/_qnx.cfg b/vendor/universalchardet/md/_qnx.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_qnx.cfg
rename to vendor/universalchardet/md/_qnx.cfg
diff --git a/aegisub/vendor/universalchardet/md/_reliantunix.cfg b/vendor/universalchardet/md/_reliantunix.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_reliantunix.cfg
rename to vendor/universalchardet/md/_reliantunix.cfg
diff --git a/aegisub/vendor/universalchardet/md/_riscos.cfg b/vendor/universalchardet/md/_riscos.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_riscos.cfg
rename to vendor/universalchardet/md/_riscos.cfg
diff --git a/aegisub/vendor/universalchardet/md/_scoos.cfg b/vendor/universalchardet/md/_scoos.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_scoos.cfg
rename to vendor/universalchardet/md/_scoos.cfg
diff --git a/aegisub/vendor/universalchardet/md/_solaris.cfg b/vendor/universalchardet/md/_solaris.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_solaris.cfg
rename to vendor/universalchardet/md/_solaris.cfg
diff --git a/aegisub/vendor/universalchardet/md/_sony.cfg b/vendor/universalchardet/md/_sony.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_sony.cfg
rename to vendor/universalchardet/md/_sony.cfg
diff --git a/aegisub/vendor/universalchardet/md/_sunos4.cfg b/vendor/universalchardet/md/_sunos4.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_sunos4.cfg
rename to vendor/universalchardet/md/_sunos4.cfg
diff --git a/aegisub/vendor/universalchardet/md/_unixware.cfg b/vendor/universalchardet/md/_unixware.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_unixware.cfg
rename to vendor/universalchardet/md/_unixware.cfg
diff --git a/aegisub/vendor/universalchardet/md/_unixware7.cfg b/vendor/universalchardet/md/_unixware7.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_unixware7.cfg
rename to vendor/universalchardet/md/_unixware7.cfg
diff --git a/aegisub/vendor/universalchardet/md/_win16.cfg b/vendor/universalchardet/md/_win16.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_win16.cfg
rename to vendor/universalchardet/md/_win16.cfg
diff --git a/aegisub/vendor/universalchardet/md/_win95.cfg b/vendor/universalchardet/md/_win95.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_win95.cfg
rename to vendor/universalchardet/md/_win95.cfg
diff --git a/aegisub/vendor/universalchardet/md/_winnt.cfg b/vendor/universalchardet/md/_winnt.cfg
similarity index 100%
rename from aegisub/vendor/universalchardet/md/_winnt.cfg
rename to vendor/universalchardet/md/_winnt.cfg
diff --git a/aegisub/vendor/universalchardet/nsBig5Prober.cpp b/vendor/universalchardet/nsBig5Prober.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsBig5Prober.cpp
rename to vendor/universalchardet/nsBig5Prober.cpp
diff --git a/aegisub/vendor/universalchardet/nsBig5Prober.h b/vendor/universalchardet/nsBig5Prober.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsBig5Prober.h
rename to vendor/universalchardet/nsBig5Prober.h
diff --git a/aegisub/vendor/universalchardet/nsCharSetProber.cpp b/vendor/universalchardet/nsCharSetProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsCharSetProber.cpp
rename to vendor/universalchardet/nsCharSetProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsCharSetProber.h b/vendor/universalchardet/nsCharSetProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsCharSetProber.h
rename to vendor/universalchardet/nsCharSetProber.h
diff --git a/aegisub/vendor/universalchardet/nsCodingStateMachine.h b/vendor/universalchardet/nsCodingStateMachine.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsCodingStateMachine.h
rename to vendor/universalchardet/nsCodingStateMachine.h
diff --git a/aegisub/vendor/universalchardet/nsEUCJPProber.cpp b/vendor/universalchardet/nsEUCJPProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsEUCJPProber.cpp
rename to vendor/universalchardet/nsEUCJPProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsEUCJPProber.h b/vendor/universalchardet/nsEUCJPProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsEUCJPProber.h
rename to vendor/universalchardet/nsEUCJPProber.h
diff --git a/aegisub/vendor/universalchardet/nsEUCKRProber.cpp b/vendor/universalchardet/nsEUCKRProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsEUCKRProber.cpp
rename to vendor/universalchardet/nsEUCKRProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsEUCKRProber.h b/vendor/universalchardet/nsEUCKRProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsEUCKRProber.h
rename to vendor/universalchardet/nsEUCKRProber.h
diff --git a/aegisub/vendor/universalchardet/nsEUCTWProber.cpp b/vendor/universalchardet/nsEUCTWProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsEUCTWProber.cpp
rename to vendor/universalchardet/nsEUCTWProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsEUCTWProber.h b/vendor/universalchardet/nsEUCTWProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsEUCTWProber.h
rename to vendor/universalchardet/nsEUCTWProber.h
diff --git a/aegisub/vendor/universalchardet/nsError.h b/vendor/universalchardet/nsError.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsError.h
rename to vendor/universalchardet/nsError.h
diff --git a/aegisub/vendor/universalchardet/nsEscCharsetProber.cpp b/vendor/universalchardet/nsEscCharsetProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsEscCharsetProber.cpp
rename to vendor/universalchardet/nsEscCharsetProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsEscCharsetProber.h b/vendor/universalchardet/nsEscCharsetProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsEscCharsetProber.h
rename to vendor/universalchardet/nsEscCharsetProber.h
diff --git a/aegisub/vendor/universalchardet/nsEscSM.cpp b/vendor/universalchardet/nsEscSM.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsEscSM.cpp
rename to vendor/universalchardet/nsEscSM.cpp
diff --git a/aegisub/vendor/universalchardet/nsGB2312Prober.cpp b/vendor/universalchardet/nsGB2312Prober.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsGB2312Prober.cpp
rename to vendor/universalchardet/nsGB2312Prober.cpp
diff --git a/aegisub/vendor/universalchardet/nsGB2312Prober.h b/vendor/universalchardet/nsGB2312Prober.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsGB2312Prober.h
rename to vendor/universalchardet/nsGB2312Prober.h
diff --git a/aegisub/vendor/universalchardet/nsHebrewProber.cpp b/vendor/universalchardet/nsHebrewProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsHebrewProber.cpp
rename to vendor/universalchardet/nsHebrewProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsHebrewProber.h b/vendor/universalchardet/nsHebrewProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsHebrewProber.h
rename to vendor/universalchardet/nsHebrewProber.h
diff --git a/aegisub/vendor/universalchardet/nsLatin1Prober.cpp b/vendor/universalchardet/nsLatin1Prober.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsLatin1Prober.cpp
rename to vendor/universalchardet/nsLatin1Prober.cpp
diff --git a/aegisub/vendor/universalchardet/nsLatin1Prober.h b/vendor/universalchardet/nsLatin1Prober.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsLatin1Prober.h
rename to vendor/universalchardet/nsLatin1Prober.h
diff --git a/aegisub/vendor/universalchardet/nsMBCSGroupProber.cpp b/vendor/universalchardet/nsMBCSGroupProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsMBCSGroupProber.cpp
rename to vendor/universalchardet/nsMBCSGroupProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsMBCSGroupProber.h b/vendor/universalchardet/nsMBCSGroupProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsMBCSGroupProber.h
rename to vendor/universalchardet/nsMBCSGroupProber.h
diff --git a/aegisub/vendor/universalchardet/nsMBCSSM.cpp b/vendor/universalchardet/nsMBCSSM.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsMBCSSM.cpp
rename to vendor/universalchardet/nsMBCSSM.cpp
diff --git a/aegisub/vendor/universalchardet/nsPkgInt.h b/vendor/universalchardet/nsPkgInt.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsPkgInt.h
rename to vendor/universalchardet/nsPkgInt.h
diff --git a/aegisub/vendor/universalchardet/nsSBCSGroupProber.cpp b/vendor/universalchardet/nsSBCSGroupProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsSBCSGroupProber.cpp
rename to vendor/universalchardet/nsSBCSGroupProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsSBCSGroupProber.h b/vendor/universalchardet/nsSBCSGroupProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsSBCSGroupProber.h
rename to vendor/universalchardet/nsSBCSGroupProber.h
diff --git a/aegisub/vendor/universalchardet/nsSBCharSetProber.cpp b/vendor/universalchardet/nsSBCharSetProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsSBCharSetProber.cpp
rename to vendor/universalchardet/nsSBCharSetProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsSBCharSetProber.h b/vendor/universalchardet/nsSBCharSetProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsSBCharSetProber.h
rename to vendor/universalchardet/nsSBCharSetProber.h
diff --git a/aegisub/vendor/universalchardet/nsSJISProber.cpp b/vendor/universalchardet/nsSJISProber.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsSJISProber.cpp
rename to vendor/universalchardet/nsSJISProber.cpp
diff --git a/aegisub/vendor/universalchardet/nsSJISProber.h b/vendor/universalchardet/nsSJISProber.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsSJISProber.h
rename to vendor/universalchardet/nsSJISProber.h
diff --git a/aegisub/vendor/universalchardet/nsUTF8Prober.cpp b/vendor/universalchardet/nsUTF8Prober.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsUTF8Prober.cpp
rename to vendor/universalchardet/nsUTF8Prober.cpp
diff --git a/aegisub/vendor/universalchardet/nsUTF8Prober.h b/vendor/universalchardet/nsUTF8Prober.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsUTF8Prober.h
rename to vendor/universalchardet/nsUTF8Prober.h
diff --git a/aegisub/vendor/universalchardet/nsUniversalDetector.cpp b/vendor/universalchardet/nsUniversalDetector.cpp
similarity index 100%
rename from aegisub/vendor/universalchardet/nsUniversalDetector.cpp
rename to vendor/universalchardet/nsUniversalDetector.cpp
diff --git a/aegisub/vendor/universalchardet/nsUniversalDetector.h b/vendor/universalchardet/nsUniversalDetector.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nsUniversalDetector.h
rename to vendor/universalchardet/nsUniversalDetector.h
diff --git a/aegisub/vendor/universalchardet/nscore.h b/vendor/universalchardet/nscore.h
similarity index 100%
rename from aegisub/vendor/universalchardet/nscore.h
rename to vendor/universalchardet/nscore.h
diff --git a/aegisub/vendor/universalchardet/prcpucfg.h b/vendor/universalchardet/prcpucfg.h
similarity index 100%
rename from aegisub/vendor/universalchardet/prcpucfg.h
rename to vendor/universalchardet/prcpucfg.h
diff --git a/aegisub/vendor/universalchardet/prmem.h b/vendor/universalchardet/prmem.h
similarity index 100%
rename from aegisub/vendor/universalchardet/prmem.h
rename to vendor/universalchardet/prmem.h
diff --git a/aegisub/vendor/universalchardet/protypes.h b/vendor/universalchardet/protypes.h
similarity index 100%
rename from aegisub/vendor/universalchardet/protypes.h
rename to vendor/universalchardet/protypes.h
diff --git a/aegisub/vendor/universalchardet/prtypes.h b/vendor/universalchardet/prtypes.h
similarity index 100%
rename from aegisub/vendor/universalchardet/prtypes.h
rename to vendor/universalchardet/prtypes.h
diff --git a/aegisub/vendor/universalchardet/xpcom-config.h b/vendor/universalchardet/xpcom-config.h
similarity index 100%
rename from aegisub/vendor/universalchardet/xpcom-config.h
rename to vendor/universalchardet/xpcom-config.h
diff --git a/aegisub/vendor/wxWidgets b/vendor/wxWidgets
similarity index 100%
rename from aegisub/vendor/wxWidgets
rename to vendor/wxWidgets
diff --git a/aegisub/vendor/zlib b/vendor/zlib
similarity index 100%
rename from aegisub/vendor/zlib
rename to vendor/zlib