diff --git a/installer/RuntimeTestLibrary/RuntimeTestLibrary.cpp b/aegisub/packages/win_installer/RuntimeTestLibrary/RuntimeTestLibrary.cpp
similarity index 100%
rename from installer/RuntimeTestLibrary/RuntimeTestLibrary.cpp
rename to aegisub/packages/win_installer/RuntimeTestLibrary/RuntimeTestLibrary.cpp
diff --git a/installer/RuntimeTestLibrary/RuntimeTestLibrary.vcproj b/aegisub/packages/win_installer/RuntimeTestLibrary/RuntimeTestLibrary.vcproj
similarity index 100%
rename from installer/RuntimeTestLibrary/RuntimeTestLibrary.vcproj
rename to aegisub/packages/win_installer/RuntimeTestLibrary/RuntimeTestLibrary.vcproj
diff --git a/installer/aegisub.bmp b/aegisub/packages/win_installer/aegisub.bmp
similarity index 100%
rename from installer/aegisub.bmp
rename to aegisub/packages/win_installer/aegisub.bmp
diff --git a/installer/aegisub.iss b/aegisub/packages/win_installer/aegisub.iss
similarity index 100%
rename from installer/aegisub.iss
rename to aegisub/packages/win_installer/aegisub.iss
diff --git a/installer/aegisub.nsi b/aegisub/packages/win_installer/aegisub.nsi
similarity index 100%
rename from installer/aegisub.nsi
rename to aegisub/packages/win_installer/aegisub.nsi
diff --git a/installer/aegisub2.iss b/aegisub/packages/win_installer/aegisub2.iss
similarity index 100%
rename from installer/aegisub2.iss
rename to aegisub/packages/win_installer/aegisub2.iss
diff --git a/installer/aegisub2lite.iss b/aegisub/packages/win_installer/aegisub2lite.iss
similarity index 100%
rename from installer/aegisub2lite.iss
rename to aegisub/packages/win_installer/aegisub2lite.iss
diff --git a/installer/latest.txt b/aegisub/packages/win_installer/latest.txt
similarity index 100%
rename from installer/latest.txt
rename to aegisub/packages/win_installer/latest.txt
diff --git a/installer/license.txt b/aegisub/packages/win_installer/license.txt
similarity index 100%
rename from installer/license.txt
rename to aegisub/packages/win_installer/license.txt
diff --git a/installer/welcome.bmp b/aegisub/packages/win_installer/welcome.bmp
similarity index 100%
rename from installer/welcome.bmp
rename to aegisub/packages/win_installer/welcome.bmp
diff --git a/auto3/Makefile.am b/aegisub/src/libauto3/Makefile.am
similarity index 100%
rename from auto3/Makefile.am
rename to aegisub/src/libauto3/Makefile.am
diff --git a/auto3/README b/aegisub/src/libauto3/README
similarity index 100%
rename from auto3/README
rename to aegisub/src/libauto3/README
diff --git a/auto3/auto3.c b/aegisub/src/libauto3/auto3.c
similarity index 100%
rename from auto3/auto3.c
rename to aegisub/src/libauto3/auto3.c
diff --git a/auto3/auto3.h b/aegisub/src/libauto3/auto3.h
similarity index 100%
rename from auto3/auto3.h
rename to aegisub/src/libauto3/auto3.h
diff --git a/auto3/auto3.sln b/aegisub/src/libauto3/auto3.sln
similarity index 100%
rename from auto3/auto3.sln
rename to aegisub/src/libauto3/auto3.sln
diff --git a/auto3/auto3.vcproj b/aegisub/src/libauto3/auto3.vcproj
similarity index 100%
rename from auto3/auto3.vcproj
rename to aegisub/src/libauto3/auto3.vcproj
diff --git a/auto3/callables.c b/aegisub/src/libauto3/callables.c
similarity index 100%
rename from auto3/callables.c
rename to aegisub/src/libauto3/callables.c