diff --git a/dom/apps/src/AppDownloadManager.jsm b/dom/apps/AppDownloadManager.jsm
similarity index 100%
rename from dom/apps/src/AppDownloadManager.jsm
rename to dom/apps/AppDownloadManager.jsm
diff --git a/dom/apps/src/AppsService.js b/dom/apps/AppsService.js
similarity index 100%
rename from dom/apps/src/AppsService.js
rename to dom/apps/AppsService.js
diff --git a/dom/apps/src/AppsService.manifest b/dom/apps/AppsService.manifest
similarity index 100%
rename from dom/apps/src/AppsService.manifest
rename to dom/apps/AppsService.manifest
diff --git a/dom/apps/src/AppsServiceChild.jsm b/dom/apps/AppsServiceChild.jsm
similarity index 100%
rename from dom/apps/src/AppsServiceChild.jsm
rename to dom/apps/AppsServiceChild.jsm
diff --git a/dom/apps/src/AppsUtils.jsm b/dom/apps/AppsUtils.jsm
similarity index 100%
rename from dom/apps/src/AppsUtils.jsm
rename to dom/apps/AppsUtils.jsm
diff --git a/dom/apps/src/FreeSpaceWatcher.jsm b/dom/apps/FreeSpaceWatcher.jsm
similarity index 100%
rename from dom/apps/src/FreeSpaceWatcher.jsm
rename to dom/apps/FreeSpaceWatcher.jsm
diff --git a/dom/apps/src/InterAppComm.cpp b/dom/apps/InterAppComm.cpp
similarity index 100%
rename from dom/apps/src/InterAppComm.cpp
rename to dom/apps/InterAppComm.cpp
diff --git a/dom/apps/src/InterAppComm.h b/dom/apps/InterAppComm.h
similarity index 100%
rename from dom/apps/src/InterAppComm.h
rename to dom/apps/InterAppComm.h
diff --git a/dom/apps/src/InterAppComm.manifest b/dom/apps/InterAppComm.manifest
similarity index 100%
rename from dom/apps/src/InterAppComm.manifest
rename to dom/apps/InterAppComm.manifest
diff --git a/dom/apps/src/InterAppCommService.js b/dom/apps/InterAppCommService.js
similarity index 100%
rename from dom/apps/src/InterAppCommService.js
rename to dom/apps/InterAppCommService.js
diff --git a/dom/apps/src/InterAppCommService.jsm b/dom/apps/InterAppCommService.jsm
similarity index 100%
rename from dom/apps/src/InterAppCommService.jsm
rename to dom/apps/InterAppCommService.jsm
diff --git a/dom/apps/src/InterAppConnection.js b/dom/apps/InterAppConnection.js
similarity index 100%
rename from dom/apps/src/InterAppConnection.js
rename to dom/apps/InterAppConnection.js
diff --git a/dom/apps/src/InterAppMessagePort.js b/dom/apps/InterAppMessagePort.js
similarity index 100%
rename from dom/apps/src/InterAppMessagePort.js
rename to dom/apps/InterAppMessagePort.js
diff --git a/dom/apps/src/OfflineCacheInstaller.jsm b/dom/apps/OfflineCacheInstaller.jsm
similarity index 100%
rename from dom/apps/src/OfflineCacheInstaller.jsm
rename to dom/apps/OfflineCacheInstaller.jsm
diff --git a/dom/apps/src/OperatorApps.jsm b/dom/apps/OperatorApps.jsm
similarity index 100%
rename from dom/apps/src/OperatorApps.jsm
rename to dom/apps/OperatorApps.jsm
diff --git a/dom/apps/src/PermissionsInstaller.jsm b/dom/apps/PermissionsInstaller.jsm
similarity index 100%
rename from dom/apps/src/PermissionsInstaller.jsm
rename to dom/apps/PermissionsInstaller.jsm
diff --git a/dom/apps/src/PermissionsTable.jsm b/dom/apps/PermissionsTable.jsm
similarity index 100%
rename from dom/apps/src/PermissionsTable.jsm
rename to dom/apps/PermissionsTable.jsm
diff --git a/dom/apps/src/ScriptPreloader.jsm b/dom/apps/ScriptPreloader.jsm
similarity index 100%
rename from dom/apps/src/ScriptPreloader.jsm
rename to dom/apps/ScriptPreloader.jsm
diff --git a/dom/apps/src/StoreTrustAnchor.jsm b/dom/apps/StoreTrustAnchor.jsm
similarity index 100%
rename from dom/apps/src/StoreTrustAnchor.jsm
rename to dom/apps/StoreTrustAnchor.jsm
diff --git a/dom/apps/src/Webapps.js b/dom/apps/Webapps.js
similarity index 100%
rename from dom/apps/src/Webapps.js
rename to dom/apps/Webapps.js
diff --git a/dom/apps/src/Webapps.jsm b/dom/apps/Webapps.jsm
similarity index 100%
rename from dom/apps/src/Webapps.jsm
rename to dom/apps/Webapps.jsm
diff --git a/dom/apps/src/Webapps.manifest b/dom/apps/Webapps.manifest
similarity index 100%
rename from dom/apps/src/Webapps.manifest
rename to dom/apps/Webapps.manifest
diff --git a/dom/apps/moz.build b/dom/apps/moz.build
index e6eb648904fa..9c6c8c14776c 100644
--- a/dom/apps/moz.build
+++ b/dom/apps/moz.build
@@ -4,10 +4,53 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['src']
-
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
+
+EXPORTS.mozilla.dom += [
+    'InterAppComm.h',
+]
+
+SOURCES += [
+    'InterAppComm.cpp',
+]
+
+EXTRA_COMPONENTS += [
+    'AppsService.js',
+    'AppsService.manifest',
+    'InterAppComm.manifest',
+    'InterAppCommService.js',
+    'InterAppConnection.js',
+    'InterAppMessagePort.js',
+    'Webapps.js',
+    'Webapps.manifest',
+]
+
+EXTRA_JS_MODULES += [
+    'AppDownloadManager.jsm',
+    'AppsServiceChild.jsm',
+    'FreeSpaceWatcher.jsm',
+    'InterAppCommService.jsm',
+    'OfflineCacheInstaller.jsm',
+    'PermissionsInstaller.jsm',
+    'PermissionsTable.jsm',
+    'StoreTrustAnchor.jsm',
+]
+
+EXTRA_PP_JS_MODULES += [
+    'AppsUtils.jsm',
+    'OperatorApps.jsm',
+    'ScriptPreloader.jsm',
+    'Webapps.jsm',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '/js/xpconnect/wrappers',
+]
diff --git a/dom/apps/src/moz.build b/dom/apps/src/moz.build
deleted file mode 100644
index e1f0611c727a..000000000000
--- a/dom/apps/src/moz.build
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS.mozilla.dom += [
-    'InterAppComm.h',
-]
-
-SOURCES += [
-    'InterAppComm.cpp',
-]
-
-EXTRA_COMPONENTS += [
-    'AppsService.js',
-    'AppsService.manifest',
-    'InterAppComm.manifest',
-    'InterAppCommService.js',
-    'InterAppConnection.js',
-    'InterAppMessagePort.js',
-    'Webapps.js',
-    'Webapps.manifest',
-]
-
-EXTRA_JS_MODULES += [
-    'AppDownloadManager.jsm',
-    'AppsServiceChild.jsm',
-    'FreeSpaceWatcher.jsm',
-    'InterAppCommService.jsm',
-    'OfflineCacheInstaller.jsm',
-    'PermissionsInstaller.jsm',
-    'PermissionsTable.jsm',
-    'StoreTrustAnchor.jsm',
-]
-
-EXTRA_PP_JS_MODULES += [
-    'AppsUtils.jsm',
-    'OperatorApps.jsm',
-    'ScriptPreloader.jsm',
-    'Webapps.jsm',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'
-
-LOCAL_INCLUDES += [
-    '/js/xpconnect/wrappers',
-]
-