--- a/scripts/partner-repacks.py
+++ b/scripts/partner-repacks.py
@@ -30,17 +30,17 @@ UPX_BIN = 'upx'
 SEVENZIP_BUNDLE = 'app.7z'
 SEVENZIP_APPTAG = 'app.tag'
 SEVENZIP_APPTAG_PATH = path.join('browser/installer/windows', SEVENZIP_APPTAG)
 SEVENZIP_HEADER = '7zSD.sfx'
 SEVENZIP_HEADER_PATH = path.join('other-licenses/7zstub/firefox',
                                  SEVENZIP_HEADER)
 SEVENZIP_HEADER_COMPRESSED = SEVENZIP_HEADER + '.compressed'
 
-WINDOWS_DEST_DIR = 'core/browser'
+WINDOWS_DEST_DIR = 'core'
 
 
 class StrictFancyURLopener(urllib.FancyURLopener):
     """Unlike FancyURLopener this class raises exceptions for generic HTTP
     errors, like 404, 500. It reuses URLopener.http_error_default redefined in
     FancyURLopener"""
 
     def http_error_default(self, url, fp, errcode, errmsg, headers):
@@ -362,17 +362,17 @@ class RepackLinux(RepackBase):
         super(RepackLinux, self).unpackBuild()
         bunzip2_cmd = "bunzip2 %s" % self.build
         shellCommand(bunzip2_cmd)
         if not path.exists(self.uncompressed_build):
             log.error("Error: Unable to uncompress build %s" % self.build)
             sys.exit(1)
 
     def copyFiles(self):
-        super(RepackLinux, self).copyFiles('firefox/browser')
+        super(RepackLinux, self).copyFiles('firefox')
 
     def repackBuild(self):
         if options.quiet:
             tar_flags = "rf"
         else:
             tar_flags = "rvf"
         tar_cmd = "tar %s %s firefox" % (tar_flags, self.uncompressed_build)
         shellCommand(tar_cmd)
@@ -398,20 +398,20 @@ class RepackMac(RepackBase):
         # to get rid of while working with it uncompressed.
         os.remove("stage/ ")
 
     def copyFiles(self):
         for i in ['distribution', 'extensions', 'searchplugins']:
             full_path = path.join(self.full_partner_path, i)
             if path.exists(full_path):
                 cp_cmd = "cp -r %s %s" % (full_path,
-                  path.join("stage", "Firefox.app", "Contents", "MacOS", "browser"))
+                  path.join("stage", "Firefox.app", "Contents", "MacOS"))
                 shellCommand(cp_cmd)
         self.createOverrideIni(path.join("stage", "Firefox.app", "Contents",
-                                         "MacOS", "browser"))
+                                         "MacOS"))
 
     def repackBuild(self):
         if options.quiet:
             quiet_flag = "--verbosity 0"
         else:
             quiet_flag = ""
         pkg_cmd = "%s --source stage/ --target \"%s\" --volname 'Firefox' " \
         "--icon stage/.VolumeIcon.icns --symlink '/Applications':' ' %s" \