rename from modules/libpref/src/Makefile.in
rename to modules/libpref/Makefile.in

rename from modules/libpref/src/Preferences.cpp
rename to modules/libpref/Preferences.cpp

rename from modules/libpref/public/Preferences.h
rename to modules/libpref/Preferences.h

rename from modules/libpref/src/init/all.js
rename to modules/libpref/init/all.js

--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
@@ -1,9 +1,43 @@
 # -*- 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/.
 
-DIRS += ['public', 'src']
 TEST_DIRS += ['test']
 
+XPIDL_SOURCES += [
+    'nsIPrefBranch.idl',
+    'nsIPrefBranch2.idl',
+    'nsIPrefBranchInternal.idl',
+    'nsIPrefLocalizedString.idl',
+    'nsIPrefService.idl',
+    'nsIRelativeFilePref.idl',
+]
+
+XPIDL_MODULE = 'pref'
+
+EXPORTS.mozilla += [
+    'Preferences.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsPrefBranch.cpp',
+    'nsPrefsFactory.cpp',
+    'Preferences.cpp',
+    'prefread.cpp',
+]
+
+# prefapi.cpp cannot be built in unified mode because it uses plarena.h
+SOURCES += [
+    'prefapi.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
+
+DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
+DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']

rename from modules/libpref/public/nsIPrefBranch.idl
rename to modules/libpref/nsIPrefBranch.idl

rename from modules/libpref/public/nsIPrefBranch2.idl
rename to modules/libpref/nsIPrefBranch2.idl

rename from modules/libpref/public/nsIPrefBranchInternal.idl
rename to modules/libpref/nsIPrefBranchInternal.idl

rename from modules/libpref/public/nsIPrefLocalizedString.idl
rename to modules/libpref/nsIPrefLocalizedString.idl

rename from modules/libpref/public/nsIPrefService.idl
rename to modules/libpref/nsIPrefService.idl

rename from modules/libpref/public/nsIRelativeFilePref.idl
rename to modules/libpref/nsIRelativeFilePref.idl

rename from modules/libpref/src/nsPrefBranch.cpp
rename to modules/libpref/nsPrefBranch.cpp

rename from modules/libpref/src/nsPrefBranch.h
rename to modules/libpref/nsPrefBranch.h

rename from modules/libpref/src/nsPrefsFactory.cpp
rename to modules/libpref/nsPrefsFactory.cpp

rename from modules/libpref/src/prefapi.cpp
rename to modules/libpref/prefapi.cpp

rename from modules/libpref/src/prefapi.h
rename to modules/libpref/prefapi.h

rename from modules/libpref/src/prefapi_private_data.h
rename to modules/libpref/prefapi_private_data.h

rename from modules/libpref/src/prefread.cpp
rename to modules/libpref/prefread.cpp

rename from modules/libpref/src/prefread.h
rename to modules/libpref/prefread.h

deleted file mode 100644
--- a/modules/libpref/public/moz.build
+++ /dev/null
@@ -1,21 +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 += [
-    'nsIPrefBranch.idl',
-    'nsIPrefBranch2.idl',
-    'nsIPrefBranchInternal.idl',
-    'nsIPrefLocalizedString.idl',
-    'nsIPrefService.idl',
-    'nsIRelativeFilePref.idl',
-]
-
-XPIDL_MODULE = 'pref'
-
-EXPORTS.mozilla += [
-    'Preferences.h',
-]
-

deleted file mode 100644
--- a/modules/libpref/src/moz.build
+++ /dev/null
@@ -1,26 +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/.
-
-UNIFIED_SOURCES += [
-    'nsPrefBranch.cpp',
-    'nsPrefsFactory.cpp',
-    'Preferences.cpp',
-    'prefread.cpp',
-]
-
-# prefapi.cpp cannot be built in unified mode because it uses plarena.h
-SOURCES += [
-    'prefapi.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
-
-DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
-DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']