diff --git a/Install/win32/Setup.iss b/Install/windows/Setup.iss
similarity index 87%
rename from Install/win32/Setup.iss
rename to Install/windows/Setup.iss
index deef0bd..6b4ec98 100644
--- a/Install/win32/Setup.iss
+++ b/Install/windows/Setup.iss
@@ -5,7 +5,7 @@
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{1DBDC946-E964-430C-9BD6-2AE5E426E5AC}
+AppId={{524C9B9A-B57F-4FEC-89BE-292202EBA44D}
 AppName=Simba
 AppVerName=Simba 1.0 Beta
 AppPublisherURL=http://simba.villavu.com/
@@ -13,7 +13,7 @@ AppSupportURL=http://simba.villavu.com/
 AppUpdatesURL=http://simba.villavu.com/
 DefaultDirName={pf}\Simba
 DefaultGroupName=Simba
-OutputDir=C:\Remake\Install\win32
+OutputDir=C:\Remake\Install\windows\
 OutputBaseFilename=setup
 Compression=lzma
 SolidCompression=yes
@@ -30,11 +30,13 @@ Name: "{app}\Extensions"
 Name: "{app}\Includes"
 Name: "{app}\Plugins"
 Name: "{app}\Scripts"
+Name: "{app}\Scripts\Tests"
 
 [Files]
 Source: "C:\Remake\Simba.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Remake\Extensions\srl.sex"; DestDir: "{app}\Extensions"; Flags: ignoreversion
 Source: "C:\Remake\Fonts\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Remake\Tests\PS\*"; DestDir:"{app}\Scripts\Tests\"; Flags: ignoreversion
+Source: "C:\Remake\Tests\PS\*"; DestDir:"{app}\Scripts\Tests"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/Tests/PS/IncludeTest.simba b/Tests/PS/IncludeTest.simba
deleted file mode 100644
index 8e9c926..0000000
--- a/Tests/PS/IncludeTest.simba
+++ /dev/null
@@ -1,6 +0,0 @@
-program new;
-{.include test.mufa}
-begin
-  Writeln(TestStr);
-  Writeln(inttostr(MultiPly(500,-20)));
-end.