diff --git a/gulpfile.js b/gulpfile.js
index 9f130d30532..1a188304b9b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,7 +17,8 @@ const paths = {
     coverage: './coverage/',
     node_modules: './node_modules/',
     popupDir: './src/popup/',
-    cssDir: './src/popup/css/'
+    cssDir: './src/popup/css/',
+    safari: './src/safari/'
 };
 
 const filters = {
@@ -28,10 +29,6 @@ const filters = {
         'build/popup/fonts/fontawesome*.woff'
     ],
     safari: [
-        '!build/safari/**/*',
-        '!build/downloader/**/*'
-    ],
-    safariDir: [
         '!build/safari/**/*'
     ],
     webExt: [
@@ -163,14 +160,10 @@ function edgeCopyAssets(source, dest) {
 
 function distSafari(cb) {
     const buildPath = paths.dist + 'Safari/';
-    const extBuildPath = buildPath + 'bitwarden.safariextension/';
-    const extAssetsBuildPath = extBuildPath + 'safari/';
 
     return del([buildPath + '**/*'])
-        .then(() => safariCopyBuild(paths.build + '**/*', extBuildPath))
-        .then(() => copy(extAssetsBuildPath + '**/*', extBuildPath))
-        .then(() => del([extAssetsBuildPath]))
-        .then(() => safariZip(buildPath))
+        .then(() => copy(paths.safari + '**/*', buildPath))
+        .then(() => safariCopyBuild(paths.build + '**/*', buildPath + 'safari/app'))
         .then(() => {
             return cb;
         }, () => {
@@ -182,43 +175,7 @@ function safariCopyBuild(source, dest) {
     return new Promise((resolve, reject) => {
         gulp.src(source)
             .on('error', reject)
-            .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts).concat(filters.webExt)))
-            .pipe(gulpif('popup/index.html', replace('__BROWSER__', 'browser_safari')))
-            .pipe(gulp.dest(dest))
-            .on('end', resolve);
-    });
-}
-
-function safariZip(buildPath) {
-    return new Promise((resolve, reject) => {
-        gulp.src(buildPath + '**/*')
-            .on('error', reject)
-            .pipe(zip(distFileName('safari', 'zip')))
-            .pipe(gulp.dest(paths.dist))
-            .on('end', resolve);
-    });
-}
-
-function distSafariApp(cb) {
-    const buildPath = paths.dist + 'Safari/';
-    const extBuildPath = buildPath + 'app_extension/';
-    const appPath = './src/safari/app/desktop/'
-
-    return del([buildPath + '**/*'])
-        .then(() => copy(appPath + '**/*', extBuildPath))
-        .then(() => safariAppCopyBuild(paths.build + '**/*', extBuildPath + 'safari/app'))
-        .then(() => {
-            return cb;
-        }, () => {
-            return cb;
-        });
-}
-
-function safariAppCopyBuild(source, dest) {
-    return new Promise((resolve, reject) => {
-        gulp.src(source)
-            .on('error', reject)
-            .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts).concat(filters.safariDir)
+            .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts)
                 .concat(filters.webExt).concat(filters.nonSafariApp)))
             .pipe(gulp.dest(dest))
             .on('end', resolve);
@@ -262,7 +219,6 @@ exports['dist:chrome'] = distChrome;
 exports['dist:opera'] = distOpera;
 exports['dist:edge'] = distEdge;
 exports['dist:safari'] = distSafari;
-exports['dist:safariApp'] = distSafariApp;
 exports.dist = gulp.parallel(distFirefox, distChrome, distOpera, distEdge, distSafari);
 exports['ci:coverage'] = ciCoverage;
 exports.ci = ciCoverage;
diff --git a/src/safari/Icon-128.png b/src/safari/Icon-128.png
deleted file mode 100644
index 7e819bcb88c..00000000000
Binary files a/src/safari/Icon-128.png and /dev/null differ
diff --git a/src/safari/Icon-32.png b/src/safari/Icon-32.png
deleted file mode 100644
index 28923a676d7..00000000000
Binary files a/src/safari/Icon-32.png and /dev/null differ
diff --git a/src/safari/Icon-48.png b/src/safari/Icon-48.png
deleted file mode 100644
index 93e7bc82e8d..00000000000
Binary files a/src/safari/Icon-48.png and /dev/null differ
diff --git a/src/safari/Icon-64.png b/src/safari/Icon-64.png
deleted file mode 100644
index 538d20b76b5..00000000000
Binary files a/src/safari/Icon-64.png and /dev/null differ
diff --git a/src/safari/Icon-96.png b/src/safari/Icon-96.png
deleted file mode 100644
index be9917680d7..00000000000
Binary files a/src/safari/Icon-96.png and /dev/null differ
diff --git a/src/safari/Info.plist b/src/safari/Info.plist
deleted file mode 100644
index 021b39859f1..00000000000
--- a/src/safari/Info.plist
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>Author</key>
-	<string>8bit Solutions LLC</string>
-	<key>Builder Version</key>
-	<string>13604.4.7.1.3</string>
-	<key>CFBundleDisplayName</key>
-	<string>Bitwarden</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.bitwarden.safari</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.41.0</string>
-	<key>CFBundleVersion</key>
-	<string>1.41.0</string>
-	<key>Chrome</key>
-	<dict>
-		<key>Database Quota</key>
-		<integer>104857600</integer>
-		<key>Global Page</key>
-		<string>background.html</string>
-		<key>Popovers</key>
-		<array>
-			<dict>
-				<key>Filename</key>
-				<string>popup/index.html</string>
-				<key>Height</key>
-				<integer>600</integer>
-				<key>Identifier</key>
-				<string>bitwarden-popover</string>
-				<key>Width</key>
-				<integer>375</integer>
-			</dict>
-		</array>
-		<key>Toolbar Items</key>
-		<array>
-			<dict>
-				<key>Identifier</key>
-				<string>bitwarden-toolbar</string>
-				<key>Image</key>
-				<string>images/icon18_safari.png</string>
-				<key>Include By Default</key>
-				<true/>
-				<key>Label</key>
-				<string>Bitwarden</string>
-				<key>Palette Label</key>
-				<string>Bitwarden</string>
-				<key>Popover</key>
-				<string>bitwarden-popover</string>
-				<key>Tool Tip</key>
-				<string>Bitwarden</string>
-			</dict>
-		</array>
-	</dict>
-	<key>Content</key>
-	<dict>
-		<key>Scripts</key>
-		<dict>
-			<key>Start</key>
-			<array>
-				<string>content/autofill.js</string>
-				<string>content/autofiller.js</string>
-				<string>content/notificationBar.js</string>
-				<string>content/shortcuts.js</string>
-			</array>
-		</dict>
-		<key>Stylesheets</key>
-		<array>
-			<string>content/autofill.css</string>
-		</array>
-	</dict>
-	<key>Description</key>
-	<string>A secure and free password manager for all of your devices.</string>
-	<key>DeveloperIdentifier</key>
-	<string>LTZ2PFU5D6</string>
-	<key>ExtensionInfoDictionaryVersion</key>
-	<string>1.0</string>
-	<key>Permissions</key>
-	<dict>
-		<key>Website Access</key>
-		<dict>
-			<key>Include Secure Pages</key>
-			<true/>
-			<key>Level</key>
-			<string>All</string>
-		</dict>
-	</dict>
-	<key>Update Manifest URL</key>
-	<string>https://bitwarden.com/misc/safari-extension.xml</string>
-	<key>Website</key>
-	<string>https://bitwarden.com</string>
-</dict>
-</plist>
diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.pbxproj b/src/safari/desktop.xcodeproj/project.pbxproj
similarity index 100%
rename from src/safari/app/desktop/desktop.xcodeproj/project.pbxproj
rename to src/safari/desktop.xcodeproj/project.pbxproj
diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/src/safari/desktop.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to src/safari/desktop.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/src/safari/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to src/safari/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate b/src/safari/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate
similarity index 100%
rename from src/safari/app/desktop/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate
rename to src/safari/desktop.xcodeproj/project.xcworkspace/xcuserdata/kyle.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/src/safari/app/desktop/desktop.xcodeproj/xcuserdata/kyle.xcuserdatad/xcschemes/xcschememanagement.plist b/src/safari/desktop.xcodeproj/xcuserdata/kyle.xcuserdatad/xcschemes/xcschememanagement.plist
similarity index 100%
rename from src/safari/app/desktop/desktop.xcodeproj/xcuserdata/kyle.xcuserdatad/xcschemes/xcschememanagement.plist
rename to src/safari/desktop.xcodeproj/xcuserdata/kyle.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/src/safari/app/desktop/desktop/AppDelegate.swift b/src/safari/desktop/AppDelegate.swift
similarity index 100%
rename from src/safari/app/desktop/desktop/AppDelegate.swift
rename to src/safari/desktop/AppDelegate.swift
diff --git a/src/safari/app/desktop/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/safari/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from src/safari/app/desktop/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to src/safari/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/src/safari/app/desktop/desktop/Assets.xcassets/Contents.json b/src/safari/desktop/Assets.xcassets/Contents.json
similarity index 100%
rename from src/safari/app/desktop/desktop/Assets.xcassets/Contents.json
rename to src/safari/desktop/Assets.xcassets/Contents.json
diff --git a/src/safari/app/desktop/desktop/Base.lproj/Main.storyboard b/src/safari/desktop/Base.lproj/Main.storyboard
similarity index 100%
rename from src/safari/app/desktop/desktop/Base.lproj/Main.storyboard
rename to src/safari/desktop/Base.lproj/Main.storyboard
diff --git a/src/safari/app/desktop/desktop/Info.plist b/src/safari/desktop/Info.plist
similarity index 100%
rename from src/safari/app/desktop/desktop/Info.plist
rename to src/safari/desktop/Info.plist
diff --git a/src/safari/app/desktop/desktop/ViewController.swift b/src/safari/desktop/ViewController.swift
similarity index 100%
rename from src/safari/app/desktop/desktop/ViewController.swift
rename to src/safari/desktop/ViewController.swift
diff --git a/src/safari/app/desktop/desktop/desktop.entitlements b/src/safari/desktop/desktop.entitlements
similarity index 100%
rename from src/safari/app/desktop/desktop/desktop.entitlements
rename to src/safari/desktop/desktop.entitlements
diff --git a/src/safari/app/desktop/safari/Base.lproj/SafariExtensionViewController.xib b/src/safari/safari/Base.lproj/SafariExtensionViewController.xib
similarity index 100%
rename from src/safari/app/desktop/safari/Base.lproj/SafariExtensionViewController.xib
rename to src/safari/safari/Base.lproj/SafariExtensionViewController.xib
diff --git a/src/safari/app/desktop/safari/Info.plist b/src/safari/safari/Info.plist
similarity index 100%
rename from src/safari/app/desktop/safari/Info.plist
rename to src/safari/safari/Info.plist
diff --git a/src/safari/app/desktop/safari/SafariExtensionHandler.swift b/src/safari/safari/SafariExtensionHandler.swift
similarity index 100%
rename from src/safari/app/desktop/safari/SafariExtensionHandler.swift
rename to src/safari/safari/SafariExtensionHandler.swift
diff --git a/src/safari/app/desktop/safari/SafariExtensionViewController.swift b/src/safari/safari/SafariExtensionViewController.swift
similarity index 100%
rename from src/safari/app/desktop/safari/SafariExtensionViewController.swift
rename to src/safari/safari/SafariExtensionViewController.swift
diff --git a/src/safari/app/desktop/safari/ToolbarItemIcon.pdf b/src/safari/safari/ToolbarItemIcon.pdf
similarity index 100%
rename from src/safari/app/desktop/safari/ToolbarItemIcon.pdf
rename to src/safari/safari/ToolbarItemIcon.pdf
diff --git a/src/safari/app/desktop/safari/app/popup/index.html b/src/safari/safari/app/popup/index.html
similarity index 100%
rename from src/safari/app/desktop/safari/app/popup/index.html
rename to src/safari/safari/app/popup/index.html
diff --git a/src/safari/app/desktop/safari/safari.entitlements b/src/safari/safari/safari.entitlements
similarity index 100%
rename from src/safari/app/desktop/safari/safari.entitlements
rename to src/safari/safari/safari.entitlements
diff --git a/src/safari/app/desktop/safari/script.js b/src/safari/safari/script.js
similarity index 100%
rename from src/safari/app/desktop/safari/script.js
rename to src/safari/safari/script.js