diff --git a/warp4j b/warp4j
index 87259f7..bb7551b 100755
--- a/warp4j
+++ b/warp4j
@@ -793,14 +793,16 @@ function warp_targets() {
             --output "$WARPED_TEMP_PATH/$MAC/$APP_NAME" \
             &> /dev/null
         fail_if $? "Failed to warp for $MAC"
-        echo "Creating runnable MacOs Application Bundle $APP_NAME.app
-        mkdir $WARPED_TEMP_PATH/$MAC/$APP_NAME.app
-        cp "$WARPED_TEMP_PATH/$MAC/$APP_NAME $WARPED_TEMP_PATH/$MAC/$APP_NAME.app
+        echo "Creating runnable $MAC application bundle"
+        mkdir "$WARPED_TEMP_PATH/$MAC/$APP_NAME.app"
+        cp "$WARPED_TEMP_PATH/$MAC/$APP_NAME" "$WARPED_TEMP_PATH/$MAC/$APP_NAME.app"
         echo "Archiving for $MAC..."
-        tar -C "$WARPED_TEMP_PATH/$MAC" -czf "$WARPED_TEMP_PATH/$APP_NAME-$MAC-x64.tar.gz" "$APP_NAME"
+        tar -C "$WARPED_TEMP_PATH/$MAC" -czf "$WARPED_TEMP_PATH/$APP_NAME-$MAC-x64.tar.gz" "$APP_NAME.app"
         fail_if $? "Failed to make archive for $MAC"
+        mv "$WARPED_TEMP_PATH/$APP_NAME-$MAC-x64.tar.gz" "$WARPED_PATH/"
         mv "$WARPED_TEMP_PATH/$MAC/$APP_NAME" "$WARPED_PATH/$APP_NAME-$MAC-x64"
-        mv "$WARPED_TEMP_PATH/$APP_NAME-$MAC-x64.tar.gz" "$WARPED_PATH"
+        rm "$WARPED_TEMP_PATH/$MAC/$APP_NAME.app/$APP_NAME"
+        rmdir "$WARPED_TEMP_PATH/$MAC/$APP_NAME.app"
         rmdir "$WARPED_TEMP_PATH/$MAC"
     fi