diff --git a/browser/components/build/moz.build b/browser/components/build/moz.build
index 262ec6198fb..6b6b57adcdb 100644
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -20,7 +20,7 @@ LOCAL_INCLUDES += [
     '../about',
     '../dirprovider',
     '../feeds',
-    '../migration/src',
+    '../migration',
     '../shell/src',
 ]
 
diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/BrowserProfileMigrators.manifest
similarity index 100%
rename from browser/components/migration/src/BrowserProfileMigrators.manifest
rename to browser/components/migration/BrowserProfileMigrators.manifest
diff --git a/browser/components/migration/src/ChromeProfileMigrator.js b/browser/components/migration/ChromeProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/ChromeProfileMigrator.js
rename to browser/components/migration/ChromeProfileMigrator.js
diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/FirefoxProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/FirefoxProfileMigrator.js
rename to browser/components/migration/FirefoxProfileMigrator.js
diff --git a/browser/components/migration/src/IEProfileMigrator.js b/browser/components/migration/IEProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/IEProfileMigrator.js
rename to browser/components/migration/IEProfileMigrator.js
diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/MigrationUtils.jsm
similarity index 100%
rename from browser/components/migration/src/MigrationUtils.jsm
rename to browser/components/migration/MigrationUtils.jsm
diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/ProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/ProfileMigrator.js
rename to browser/components/migration/ProfileMigrator.js
diff --git a/browser/components/migration/src/SafariProfileMigrator.js b/browser/components/migration/SafariProfileMigrator.js
similarity index 100%
rename from browser/components/migration/src/SafariProfileMigrator.js
rename to browser/components/migration/SafariProfileMigrator.js
diff --git a/browser/components/migration/moz.build b/browser/components/migration/moz.build
index 857759511de..ca9aea4c28e 100644
--- a/browser/components/migration/moz.build
+++ b/browser/components/migration/moz.build
@@ -4,10 +4,51 @@
 # 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 += ['public', 'src']
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
-XPCSHELL_TESTS_MANIFESTS += [
-    'tests/unit/xpcshell.ini',
+JAR_MANIFESTS += ['jar.mn']
+
+XPIDL_SOURCES += [
+    'nsIBrowserProfileMigrator.idl',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+XPIDL_MODULE = 'migration'
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    SOURCES += [
+        'nsIEHistoryEnumerator.cpp',
+    ]
+
+EXTRA_COMPONENTS += [
+    'FirefoxProfileMigrator.js',
+    'ProfileMigrator.js',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXTRA_COMPONENTS += [
+        'IEProfileMigrator.js',
+    ]
+    DEFINES['HAS_IE_MIGRATOR'] = True
+
+EXTRA_PP_COMPONENTS += [
+    'BrowserProfileMigrators.manifest',
+    'ChromeProfileMigrator.js',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXTRA_PP_COMPONENTS += [
+        'SafariProfileMigrator.js',
+    ]
+    DEFINES['HAS_SAFARI_MIGRATOR'] = True
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXTRA_PP_COMPONENTS += [
+        'SafariProfileMigrator.js',
+    ]
+    DEFINES['HAS_SAFARI_MIGRATOR'] = True
+
+EXTRA_PP_JS_MODULES += [
+    'MigrationUtils.jsm',
+]
+
+FINAL_LIBRARY = 'browsercomps'
diff --git a/browser/components/migration/public/nsIBrowserProfileMigrator.idl b/browser/components/migration/nsIBrowserProfileMigrator.idl
similarity index 100%
rename from browser/components/migration/public/nsIBrowserProfileMigrator.idl
rename to browser/components/migration/nsIBrowserProfileMigrator.idl
diff --git a/browser/components/migration/src/nsIEHistoryEnumerator.cpp b/browser/components/migration/nsIEHistoryEnumerator.cpp
similarity index 100%
rename from browser/components/migration/src/nsIEHistoryEnumerator.cpp
rename to browser/components/migration/nsIEHistoryEnumerator.cpp
diff --git a/browser/components/migration/src/nsIEHistoryEnumerator.h b/browser/components/migration/nsIEHistoryEnumerator.h
similarity index 100%
rename from browser/components/migration/src/nsIEHistoryEnumerator.h
rename to browser/components/migration/nsIEHistoryEnumerator.h
diff --git a/browser/components/migration/public/moz.build b/browser/components/migration/public/moz.build
deleted file mode 100644
index b496622bc3c..00000000000
--- a/browser/components/migration/public/moz.build
+++ /dev/null
@@ -1,12 +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/.
-
-XPIDL_SOURCES += [
-    'nsIBrowserProfileMigrator.idl',
-]
-
-XPIDL_MODULE = 'migration'
-
diff --git a/browser/components/migration/src/moz.build b/browser/components/migration/src/moz.build
deleted file mode 100644
index 43d08fe9e25..00000000000
--- a/browser/components/migration/src/moz.build
+++ /dev/null
@@ -1,44 +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/.
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += [
-        'nsIEHistoryEnumerator.cpp',
-    ]
-
-EXTRA_COMPONENTS += [
-    'FirefoxProfileMigrator.js',
-    'ProfileMigrator.js',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    EXTRA_COMPONENTS += [
-        'IEProfileMigrator.js',
-    ]
-    DEFINES['HAS_IE_MIGRATOR'] = True
-
-EXTRA_PP_COMPONENTS += [
-    'BrowserProfileMigrators.manifest',
-    'ChromeProfileMigrator.js',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    EXTRA_PP_COMPONENTS += [
-        'SafariProfileMigrator.js',
-    ]
-    DEFINES['HAS_SAFARI_MIGRATOR'] = True
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    EXTRA_PP_COMPONENTS += [
-        'SafariProfileMigrator.js',
-    ]
-    DEFINES['HAS_SAFARI_MIGRATOR'] = True
-
-EXTRA_PP_JS_MODULES += [
-    'MigrationUtils.jsm',
-]
-
-FINAL_LIBRARY = 'browsercomps'