diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.DefaultConfiguration.props b/aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
similarity index 100%
rename from aegisub/build/msbuild/Aegisub/Aegisub.DefaultConfiguration.props
rename to aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
similarity index 100%
rename from aegisub/build/msbuild/Aegisub/Aegisub.targets
rename to aegisub/build/Aegisub/Aegisub.targets
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
similarity index 100%
rename from aegisub/build/msbuild/Aegisub/Aegisub.vcxproj
rename to aegisub/build/Aegisub/Aegisub.vcxproj
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters b/aegisub/build/Aegisub/Aegisub.vcxproj.filters
similarity index 100%
rename from aegisub/build/msbuild/Aegisub/Aegisub.vcxproj.filters
rename to aegisub/build/Aegisub/Aegisub.vcxproj.filters
diff --git a/aegisub/build/msbuild/Aegisub/Aegisub.xml b/aegisub/build/Aegisub/Aegisub.xml
similarity index 100%
rename from aegisub/build/msbuild/Aegisub/Aegisub.xml
rename to aegisub/build/Aegisub/Aegisub.xml
diff --git a/aegisub/build/msbuild/Aegisub/standard-libraries.props b/aegisub/build/Aegisub/standard-libraries.props
similarity index 100%
rename from aegisub/build/msbuild/Aegisub/standard-libraries.props
rename to aegisub/build/Aegisub/standard-libraries.props
diff --git a/aegisub/build/msbuild/aegisub.props b/aegisub/build/aegisub.props
similarity index 100%
rename from aegisub/build/msbuild/aegisub.props
rename to aegisub/build/aegisub.props
diff --git a/aegisub/build/msbuild/csrihelper/csrihelper.vcxproj b/aegisub/build/csrihelper/csrihelper.vcxproj
similarity index 100%
rename from aegisub/build/msbuild/csrihelper/csrihelper.vcxproj
rename to aegisub/build/csrihelper/csrihelper.vcxproj
diff --git a/aegisub/build/msbuild/csrihelper/csrihelper.vcxproj.filters b/aegisub/build/csrihelper/csrihelper.vcxproj.filters
similarity index 100%
rename from aegisub/build/msbuild/csrihelper/csrihelper.vcxproj.filters
rename to aegisub/build/csrihelper/csrihelper.vcxproj.filters
diff --git a/aegisub/build/msbuild/hunspell/hunspell.vcxproj b/aegisub/build/hunspell/hunspell.vcxproj
similarity index 100%
rename from aegisub/build/msbuild/hunspell/hunspell.vcxproj
rename to aegisub/build/hunspell/hunspell.vcxproj
diff --git a/aegisub/build/msbuild/hunspell/hunspell.vcxproj.filters b/aegisub/build/hunspell/hunspell.vcxproj.filters
similarity index 100%
rename from aegisub/build/msbuild/hunspell/hunspell.vcxproj.filters
rename to aegisub/build/hunspell/hunspell.vcxproj.filters
diff --git a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj b/aegisub/build/libaegisub/libaegisub.vcxproj
similarity index 100%
rename from aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
rename to aegisub/build/libaegisub/libaegisub.vcxproj
diff --git a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters b/aegisub/build/libaegisub/libaegisub.vcxproj.filters
similarity index 100%
rename from aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
rename to aegisub/build/libaegisub/libaegisub.vcxproj.filters
diff --git a/aegisub/build/msbuild/libiconv/libiconv.vcxproj b/aegisub/build/libiconv/libiconv.vcxproj
similarity index 100%
rename from aegisub/build/msbuild/libiconv/libiconv.vcxproj
rename to aegisub/build/libiconv/libiconv.vcxproj
diff --git a/aegisub/build/msbuild/libiconv/libiconv.vcxproj.filters b/aegisub/build/libiconv/libiconv.vcxproj.filters
similarity index 100%
rename from aegisub/build/msbuild/libiconv/libiconv.vcxproj.filters
rename to aegisub/build/libiconv/libiconv.vcxproj.filters
diff --git a/aegisub/build/msbuild/libresrc/libresrc.vcxproj b/aegisub/build/libresrc/libresrc.vcxproj
similarity index 100%
rename from aegisub/build/msbuild/libresrc/libresrc.vcxproj
rename to aegisub/build/libresrc/libresrc.vcxproj
diff --git a/aegisub/build/msbuild/libresrc/libresrc.vcxproj.filters b/aegisub/build/libresrc/libresrc.vcxproj.filters
similarity index 100%
rename from aegisub/build/msbuild/libresrc/libresrc.vcxproj.filters
rename to aegisub/build/libresrc/libresrc.vcxproj.filters
diff --git a/aegisub/build/msbuild/lua51/lua51.vcxproj b/aegisub/build/lua51/lua51.vcxproj
similarity index 100%
rename from aegisub/build/msbuild/lua51/lua51.vcxproj
rename to aegisub/build/lua51/lua51.vcxproj
diff --git a/aegisub/build/msbuild/lua51/lua51.vcxproj.filters b/aegisub/build/lua51/lua51.vcxproj.filters
similarity index 100%
rename from aegisub/build/msbuild/lua51/lua51.vcxproj.filters
rename to aegisub/build/lua51/lua51.vcxproj.filters
diff --git a/aegisub/build/msbuild/paths.props b/aegisub/build/paths.props
similarity index 100%
rename from aegisub/build/msbuild/paths.props
rename to aegisub/build/paths.props
diff --git a/aegisub/build/msbuild/respack/Aegisub.ResPack.ProjectItems.xml b/aegisub/build/respack/Aegisub.ResPack.ProjectItems.xml
similarity index 100%
rename from aegisub/build/msbuild/respack/Aegisub.ResPack.ProjectItems.xml
rename to aegisub/build/respack/Aegisub.ResPack.ProjectItems.xml
diff --git a/aegisub/build/msbuild/respack/Aegisub.ResPack.targets b/aegisub/build/respack/Aegisub.ResPack.targets
similarity index 100%
rename from aegisub/build/msbuild/respack/Aegisub.ResPack.targets
rename to aegisub/build/respack/Aegisub.ResPack.targets
diff --git a/aegisub/build/msbuild/respack/Aegisub.ResPack.xml b/aegisub/build/respack/Aegisub.ResPack.xml
similarity index 100%
rename from aegisub/build/msbuild/respack/Aegisub.ResPack.xml
rename to aegisub/build/respack/Aegisub.ResPack.xml
diff --git a/aegisub/build/msbuild/respack/respack.vcxproj b/aegisub/build/respack/respack.vcxproj
similarity index 100%
rename from aegisub/build/msbuild/respack/respack.vcxproj
rename to aegisub/build/respack/respack.vcxproj
diff --git a/aegisub/build/msbuild/respack/respack.vcxproj.filters b/aegisub/build/respack/respack.vcxproj.filters
similarity index 100%
rename from aegisub/build/msbuild/respack/respack.vcxproj.filters
rename to aegisub/build/respack/respack.vcxproj.filters
diff --git a/aegisub/build/msbuild/standard-outdirs.props b/aegisub/build/standard-outdirs.props
similarity index 100%
rename from aegisub/build/msbuild/standard-outdirs.props
rename to aegisub/build/standard-outdirs.props
diff --git a/aegisub/build/msbuild/standard-settings.props b/aegisub/build/standard-settings.props
similarity index 100%
rename from aegisub/build/msbuild/standard-settings.props
rename to aegisub/build/standard-settings.props
diff --git a/aegisub/build/msbuild/universalchardet/universalchardet.vcxproj b/aegisub/build/universalchardet/universalchardet.vcxproj
similarity index 100%
rename from aegisub/build/msbuild/universalchardet/universalchardet.vcxproj
rename to aegisub/build/universalchardet/universalchardet.vcxproj
diff --git a/aegisub/build/msbuild/universalchardet/universalchardet.vcxproj.filters b/aegisub/build/universalchardet/universalchardet.vcxproj.filters
similarity index 100%
rename from aegisub/build/msbuild/universalchardet/universalchardet.vcxproj.filters
rename to aegisub/build/universalchardet/universalchardet.vcxproj.filters
diff --git a/aegisub/build/msbuild/userconfig/ft2.props.sample b/aegisub/build/userconfig/ft2.props.sample
similarity index 100%
rename from aegisub/build/msbuild/userconfig/ft2.props.sample
rename to aegisub/build/userconfig/ft2.props.sample
diff --git a/aegisub/build/msbuild/userconfig/paths.props.sample b/aegisub/build/userconfig/paths.props.sample
similarity index 100%
rename from aegisub/build/msbuild/userconfig/paths.props.sample
rename to aegisub/build/userconfig/paths.props.sample
diff --git a/aegisub/build/msbuild/userconfig/readme.txt b/aegisub/build/userconfig/readme.txt
similarity index 100%
rename from aegisub/build/msbuild/userconfig/readme.txt
rename to aegisub/build/userconfig/readme.txt
diff --git a/aegisub/build/msbuild/userconfig/wx.props.sample b/aegisub/build/userconfig/wx.props.sample
similarity index 100%
rename from aegisub/build/msbuild/userconfig/wx.props.sample
rename to aegisub/build/userconfig/wx.props.sample
diff --git a/aegisub/build/msbuild/wx.props b/aegisub/build/wx.props
similarity index 100%
rename from aegisub/build/msbuild/wx.props
rename to aegisub/build/wx.props