diff --git a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj b/aegisub/build/PortableInstaller/PortableInstaller.vcxproj
index 962ad7df7..60c2b0ae9 100644
--- a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj
+++ b/aegisub/build/PortableInstaller/PortableInstaller.vcxproj
@@ -65,7 +65,7 @@
automation\autoload\
-
+
automation\autoload\
@@ -77,6 +77,18 @@
automation\demos\
+
+ automation\include\aegisub\
+
+
+ automation\include\aegisub\
+
+
+ automation\include\aegisub\
+
+
+ automation\include\aegisub\
+
automation\include\
@@ -89,9 +101,15 @@
automation\include\
+
+ automation\include\
+
automation\include\
+
+ automation\include\
+
automation\include\
@@ -101,54 +119,6 @@
automation\include\
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
-
- automation\tests\
-
diff --git a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters b/aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters
index d48a560b0..4bbaab8fb 100644
--- a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters
+++ b/aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters
@@ -52,7 +52,7 @@
Automation\Autoload
-
+
Automation\Autoload
@@ -64,6 +64,18 @@
Automation\Demos
+
+ Automation\Include
+
+
+ Automation\Include
+
+
+ Automation\Include
+
+
+ Automation\Include
+
Automation\Include
@@ -76,9 +88,15 @@
Automation\Include
+
+ Automation\Include
+
Automation\Include
+
+ Automation\Include
+
Automation\Include
@@ -88,54 +106,6 @@
Automation\Include
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
-
- Automation\Tests
-
diff --git a/aegisub/packages/win_installer/fragment_automation.iss b/aegisub/packages/win_installer/fragment_automation.iss
index beed985a6..49e80d21b 100644
--- a/aegisub/packages/win_installer/fragment_automation.iss
+++ b/aegisub/packages/win_installer/fragment_automation.iss
@@ -32,29 +32,30 @@
; Contact: mailto:nielsm@indvikleren.dk
;
-
; This file declares all installables related to Aegisub Automation
[Files]
-; auto4 main
-DestDir: {app}\automation\include; Source: ..\..\automation\include\cleantags.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\clipboard.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\karaskel-auto4.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\karaskel.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\re.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\unicode.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\utils-auto4.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\utils.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-
-; Sample macros
+DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\clean-info.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\cleantags-autoload.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\kara-templater.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\karaoke-auto-leadin.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\macro-1-edgeblur.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\macro-2-mkfullwitdh.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\select-overlaps.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\select-overlaps.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\strip-tags.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
DestDir: {app}\automation\demos; Source: ..\..\automation\demos\future-windy-blur.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\demos; Source: ..\..\automation\demos\raytracer-test1.ass; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
DestDir: {app}\automation\demos; Source: ..\..\automation\demos\raytracer.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-
+DestDir: {app}\automation\include\aegisub; Source: ..\..\automation\include\aegisub\clipboard.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include\aegisub; Source: ..\..\automation\include\aegisub\re.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include\aegisub; Source: ..\..\automation\include\aegisub\unicode.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include\aegisub; Source: ..\..\automation\include\aegisub\util.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\cleantags.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\clipboard.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\karaskel-auto4.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\karaskel.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\moonscript.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\re.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\underscore.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\unicode.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\utils-auto4.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\utils.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly