diff --git a/package/common/shell.cpp b/package/common/shell.cpp
index c2a80cf13..4ce3c9afa 100644
--- a/package/common/shell.cpp
+++ b/package/common/shell.cpp
@@ -15,7 +15,6 @@
 #ifdef WIN32
 int main(int argc, char **argv, char **env)
 {
-	SetCurrentDirectory("libexec");
 	
 	// If the Slic3r is installed in a localized directory (containing non-iso
 	// characters), spaces or semicolons, use short file names.
diff --git a/package/win/package_win32.ps1 b/package/win/package_win32.ps1
index 067dda6f6..5783d147e 100644
--- a/package/win/package_win32.ps1
+++ b/package/win/package_win32.ps1
@@ -30,16 +30,12 @@ git branch | foreach {
 }
 
 if ($env:APPVEYOR) {
-    $output_dir = "${pwd}\..\..\Slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).${env:ARCH}"
+    $output_dir = "${pwd}\..\..\Slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).${env:ARCH}.zip"
 } else {
-    $output_dir = "${pwd}\..\..\Slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD)"
+    $output_dir = "${pwd}\..\..\Slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD).zip"
 }
 mkdir $output_dir
 
-copy slic3r.exe $output_dir\Slic3r.exe
-copy slic3r-console.exe $output_dir\Slic3r-console.exe
-copy slic3r-debug-console.exe $output_dir\Slic3r-debug-console.exe
-
 # Change this to where you have Strawberry Perl installed.
 New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry"
 
@@ -54,7 +50,11 @@ if ($env:ARCH -eq "32bit") {
 	$pthread= "pthreadGC2-w64.dll"
 }
 
+
 pp `
+-a "slic3r.exe;Slic3r.exe"  `
+-a "slic3r-console.exe;Slic3r-console.exe"  `
+-a "slic3r-debug-console.exe;Slic3r-debug-console.exe"  `
 -a "../../lib;lib" `
 -a "../../local-lib;local-lib" `
 -a "../../slic3r.pl;slic3r.pl" `
@@ -146,10 +146,14 @@ pp `
 -M XSLoader `
 -B `
 -M lib `
--p ..\..\slic3r.pl -o "${output_dir}\libexec.par"
+-p ..\..\slic3r.pl -o ..\..\slic3r.par
 
-Add-Type -Assembly "System.IO.Compression.FileSystem"
-[System.IO.Compression.ZipFile]::ExtractToDirectory("${output_dir}\libexec.par", "${output_dir}\libexec")
-del "${output_dir}\libexec.par"
 
-[System.IO.Compression.ZipFile]::CreateFromDirectory(${output_dir}, "${output_dir}.zip")
+# switch renaming based on whether or not using packaged exe or zip 
+# make this more useful for not being on the appveyor server
+if ($env:APPVEYOR) {
+    copy ..\..\slic3r.par ${output_file}
+} else {
+    copy ..\..\slic3r.par ${output_file}
+}
+del ..\..\slic3r.par