       'dist':
         options:
           'mozilla-addon-sdk': 'latest'
-          extension_dir: 'build/dev/uproxy/firefox'
-          dist_dir: 'build/dist/'
+          extension_dir: 'build/dist/firefox'
+          dist_dir: 'build/dist'
 
     vulcanize:
       chromeExtInline:

  'browserify:firefoxVulcanized'
]

taskManager.add 'build_firefox_xpi', [
  'build_firefox'
  'mozilla-addon-sdk'
  'mozilla-cfx-xpi:dist'
]

# --- Testing tasks ---
taskManager.add 'test_core', [
  'base'

taskManager.add 'build', [
  'build_chrome'
  'build_firefox'
]

taskManager.add 'dist', [
  'build'
  'copy:dist'
  'mozilla-addon-sdk'
  'mozilla-cfx-xpi:dist'
]

taskManager.add 'default', [
