rename from parser/htmlparser/src/CNavDTD.cpp
rename to parser/htmlparser/CNavDTD.cpp

rename from parser/htmlparser/src/CNavDTD.h
rename to parser/htmlparser/CNavDTD.h

rename from parser/htmlparser/src/CParserContext.cpp
rename to parser/htmlparser/CParserContext.cpp

rename from parser/htmlparser/src/CParserContext.h
rename to parser/htmlparser/CParserContext.h

--- a/parser/htmlparser/moz.build
+++ b/parser/htmlparser/moz.build
@@ -1,9 +1,51 @@
 # -*- 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']
+MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
+
+XPIDL_SOURCES += [
+    'nsIExpatSink.idl',
+    'nsIExtendedExpatSink.idl',
+]
+
+XPIDL_MODULE = 'htmlparser'
 
-MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
+EXPORTS += [
+    'nsHTMLTagList.h',
+    'nsHTMLTags.h',
+    'nsIContentSink.h',
+    'nsIDTD.h',
+    'nsIFragmentContentSink.h',
+    'nsIHTMLContentSink.h',
+    'nsIParser.h',
+    'nsIParserService.h',
+    'nsITokenizer.h',
+    'nsParserBase.h',
+    'nsParserCIID.h',
+    'nsParserConstants.h',
+    'nsScannerString.h',
+    'nsToken.h',
+]
+
+UNIFIED_SOURCES += [
+    'CNavDTD.cpp',
+    'CParserContext.cpp',
+    'nsElementTable.cpp',
+    'nsExpatDriver.cpp',
+    'nsHTMLEntities.cpp',
+    'nsHTMLTags.cpp',
+    'nsHTMLTokenizer.cpp',
+    'nsParser.cpp',
+    'nsParserModule.cpp',
+    'nsParserMsgUtils.cpp',
+    'nsParserService.cpp',
+    'nsScanner.cpp',
+    'nsScannerString.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'

rename from parser/htmlparser/src/nsElementTable.cpp
rename to parser/htmlparser/nsElementTable.cpp

rename from parser/htmlparser/src/nsElementTable.h
rename to parser/htmlparser/nsElementTable.h

rename from parser/htmlparser/src/nsExpatDriver.cpp
rename to parser/htmlparser/nsExpatDriver.cpp

rename from parser/htmlparser/src/nsExpatDriver.h
rename to parser/htmlparser/nsExpatDriver.h

rename from parser/htmlparser/src/nsHTMLEntities.cpp
rename to parser/htmlparser/nsHTMLEntities.cpp

rename from parser/htmlparser/src/nsHTMLEntities.h
rename to parser/htmlparser/nsHTMLEntities.h

rename from parser/htmlparser/src/nsHTMLEntityList.h
rename to parser/htmlparser/nsHTMLEntityList.h

rename from parser/htmlparser/public/nsHTMLTagList.h
rename to parser/htmlparser/nsHTMLTagList.h

rename from parser/htmlparser/src/nsHTMLTags.cpp
rename to parser/htmlparser/nsHTMLTags.cpp

rename from parser/htmlparser/public/nsHTMLTags.h
rename to parser/htmlparser/nsHTMLTags.h

rename from parser/htmlparser/src/nsHTMLTokenizer.cpp
rename to parser/htmlparser/nsHTMLTokenizer.cpp

rename from parser/htmlparser/src/nsHTMLTokenizer.h
rename to parser/htmlparser/nsHTMLTokenizer.h

rename from parser/htmlparser/public/nsIContentSink.h
rename to parser/htmlparser/nsIContentSink.h

rename from parser/htmlparser/public/nsIDTD.h
rename to parser/htmlparser/nsIDTD.h

rename from parser/htmlparser/public/nsIExpatSink.idl
rename to parser/htmlparser/nsIExpatSink.idl

rename from parser/htmlparser/public/nsIExtendedExpatSink.idl
rename to parser/htmlparser/nsIExtendedExpatSink.idl

rename from parser/htmlparser/public/nsIFragmentContentSink.h
rename to parser/htmlparser/nsIFragmentContentSink.h

rename from parser/htmlparser/public/nsIHTMLContentSink.h
rename to parser/htmlparser/nsIHTMLContentSink.h

rename from parser/htmlparser/public/nsIParser.h
rename to parser/htmlparser/nsIParser.h

rename from parser/htmlparser/public/nsIParserService.h
rename to parser/htmlparser/nsIParserService.h

rename from parser/htmlparser/public/nsITokenizer.h
rename to parser/htmlparser/nsITokenizer.h

rename from parser/htmlparser/src/nsParser.cpp
rename to parser/htmlparser/nsParser.cpp

rename from parser/htmlparser/src/nsParser.h
rename to parser/htmlparser/nsParser.h

rename from parser/htmlparser/public/nsParserBase.h
rename to parser/htmlparser/nsParserBase.h

rename from parser/htmlparser/public/nsParserCIID.h
rename to parser/htmlparser/nsParserCIID.h

rename from parser/htmlparser/public/nsParserConstants.h
rename to parser/htmlparser/nsParserConstants.h

rename from parser/htmlparser/src/nsParserModule.cpp
rename to parser/htmlparser/nsParserModule.cpp

rename from parser/htmlparser/src/nsParserMsgUtils.cpp
rename to parser/htmlparser/nsParserMsgUtils.cpp

rename from parser/htmlparser/src/nsParserMsgUtils.h
rename to parser/htmlparser/nsParserMsgUtils.h

rename from parser/htmlparser/src/nsParserService.cpp
rename to parser/htmlparser/nsParserService.cpp

rename from parser/htmlparser/src/nsParserService.h
rename to parser/htmlparser/nsParserService.h

rename from parser/htmlparser/src/nsScanner.cpp
rename to parser/htmlparser/nsScanner.cpp

rename from parser/htmlparser/src/nsScanner.h
rename to parser/htmlparser/nsScanner.h

rename from parser/htmlparser/src/nsScannerString.cpp
rename to parser/htmlparser/nsScannerString.cpp

rename from parser/htmlparser/public/nsScannerString.h
rename to parser/htmlparser/nsScannerString.h

rename from parser/htmlparser/public/nsToken.h
rename to parser/htmlparser/nsToken.h

deleted file mode 100644
--- a/parser/htmlparser/public/moz.build
+++ /dev/null
@@ -1,30 +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 += [
-    'nsIExpatSink.idl',
-    'nsIExtendedExpatSink.idl',
-]
-
-XPIDL_MODULE = 'htmlparser'
-
-EXPORTS += [
-    'nsHTMLTagList.h',
-    'nsHTMLTags.h',
-    'nsIContentSink.h',
-    'nsIDTD.h',
-    'nsIFragmentContentSink.h',
-    'nsIHTMLContentSink.h',
-    'nsIParser.h',
-    'nsIParserService.h',
-    'nsITokenizer.h',
-    'nsParserBase.h',
-    'nsParserCIID.h',
-    'nsParserConstants.h',
-    'nsScannerString.h',
-    'nsToken.h',
-]
-

deleted file mode 100644
--- a/parser/htmlparser/src/moz.build
+++ /dev/null
@@ -1,25 +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 += [
-    'CNavDTD.cpp',
-    'CParserContext.cpp',
-    'nsElementTable.cpp',
-    'nsExpatDriver.cpp',
-    'nsHTMLEntities.cpp',
-    'nsHTMLTags.cpp',
-    'nsHTMLTokenizer.cpp',
-    'nsParser.cpp',
-    'nsParserModule.cpp',
-    'nsParserMsgUtils.cpp',
-    'nsParserService.cpp',
-    'nsScanner.cpp',
-    'nsScannerString.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'