deleted file mode 100644
--- a/rdf/base/idl/moz.build
+++ /dev/null
@@ -1,33 +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 += [
-    'nsIRDFCompositeDataSource.idl',
-    'nsIRDFContainer.idl',
-    'nsIRDFContainerUtils.idl',
-    'nsIRDFDataSource.idl',
-    'nsIRDFDelegateFactory.idl',
-    'nsIRDFInferDataSource.idl',
-    'nsIRDFInMemoryDataSource.idl',
-    'nsIRDFLiteral.idl',
-    'nsIRDFNode.idl',
-    'nsIRDFObserver.idl',
-    'nsIRDFPropagatableDataSource.idl',
-    'nsIRDFPurgeableDataSource.idl',
-    'nsIRDFRemoteDataSource.idl',
-    'nsIRDFResource.idl',
-    'nsIRDFService.idl',
-    'nsIRDFXMLParser.idl',
-    'nsIRDFXMLSerializer.idl',
-    'nsIRDFXMLSink.idl',
-    'nsIRDFXMLSource.idl',
-    'rdfIDataSource.idl',
-    'rdfISerializer.idl',
-    'rdfITripleVisitor.idl',
-]
-
-XPIDL_MODULE = 'rdf'
-

--- a/rdf/base/moz.build
+++ b/rdf/base/moz.build
@@ -1,7 +1,57 @@
 # -*- 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 += ['idl', 'public', 'src']
+XPIDL_SOURCES += [
+    'nsIRDFCompositeDataSource.idl',
+    'nsIRDFContainer.idl',
+    'nsIRDFContainerUtils.idl',
+    'nsIRDFDataSource.idl',
+    'nsIRDFDelegateFactory.idl',
+    'nsIRDFInferDataSource.idl',
+    'nsIRDFInMemoryDataSource.idl',
+    'nsIRDFLiteral.idl',
+    'nsIRDFNode.idl',
+    'nsIRDFObserver.idl',
+    'nsIRDFPropagatableDataSource.idl',
+    'nsIRDFPurgeableDataSource.idl',
+    'nsIRDFRemoteDataSource.idl',
+    'nsIRDFResource.idl',
+    'nsIRDFService.idl',
+    'nsIRDFXMLParser.idl',
+    'nsIRDFXMLSerializer.idl',
+    'nsIRDFXMLSink.idl',
+    'nsIRDFXMLSource.idl',
+    'rdfIDataSource.idl',
+    'rdfISerializer.idl',
+    'rdfITripleVisitor.idl',
+]
+
+XPIDL_MODULE = 'rdf'
+
+EXPORTS += [
+    'nsIRDFContentSink.h',
+    'rdf.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsCompositeDataSource.cpp',
+    'nsContainerEnumerator.cpp',
+    'nsDefaultResourceFactory.cpp',
+    'nsInMemoryDataSource.cpp',
+    'nsNameSpaceMap.cpp',
+    'nsRDFContainer.cpp',
+    'nsRDFContainerUtils.cpp',
+    'nsRDFContentSink.cpp',
+    'nsRDFService.cpp',
+    'nsRDFXMLDataSource.cpp',
+    'nsRDFXMLParser.cpp',
+    'nsRDFXMLSerializer.cpp',
+    'rdfTriplesSerializer.cpp',
+    'rdfutil.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+FINAL_LIBRARY = 'rdf'

rename from rdf/base/src/nsCompositeDataSource.cpp
rename to rdf/base/nsCompositeDataSource.cpp

rename from rdf/base/src/nsContainerEnumerator.cpp
rename to rdf/base/nsContainerEnumerator.cpp

rename from rdf/base/src/nsDefaultResourceFactory.cpp
rename to rdf/base/nsDefaultResourceFactory.cpp

rename from rdf/base/idl/nsIRDFCompositeDataSource.idl
rename to rdf/base/nsIRDFCompositeDataSource.idl

rename from rdf/base/idl/nsIRDFContainer.idl
rename to rdf/base/nsIRDFContainer.idl

rename from rdf/base/idl/nsIRDFContainerUtils.idl
rename to rdf/base/nsIRDFContainerUtils.idl

rename from rdf/base/public/nsIRDFContentSink.h
rename to rdf/base/nsIRDFContentSink.h

rename from rdf/base/idl/nsIRDFDataSource.idl
rename to rdf/base/nsIRDFDataSource.idl

rename from rdf/base/idl/nsIRDFDelegateFactory.idl
rename to rdf/base/nsIRDFDelegateFactory.idl

rename from rdf/base/idl/nsIRDFInMemoryDataSource.idl
rename to rdf/base/nsIRDFInMemoryDataSource.idl

rename from rdf/base/idl/nsIRDFInferDataSource.idl
rename to rdf/base/nsIRDFInferDataSource.idl

rename from rdf/base/idl/nsIRDFLiteral.idl
rename to rdf/base/nsIRDFLiteral.idl

rename from rdf/base/idl/nsIRDFNode.idl
rename to rdf/base/nsIRDFNode.idl

rename from rdf/base/idl/nsIRDFObserver.idl
rename to rdf/base/nsIRDFObserver.idl

rename from rdf/base/idl/nsIRDFPropagatableDataSource.idl
rename to rdf/base/nsIRDFPropagatableDataSource.idl

rename from rdf/base/idl/nsIRDFPurgeableDataSource.idl
rename to rdf/base/nsIRDFPurgeableDataSource.idl

rename from rdf/base/idl/nsIRDFRemoteDataSource.idl
rename to rdf/base/nsIRDFRemoteDataSource.idl

rename from rdf/base/idl/nsIRDFResource.idl
rename to rdf/base/nsIRDFResource.idl

rename from rdf/base/idl/nsIRDFService.idl
rename to rdf/base/nsIRDFService.idl

rename from rdf/base/idl/nsIRDFXMLParser.idl
rename to rdf/base/nsIRDFXMLParser.idl

rename from rdf/base/idl/nsIRDFXMLSerializer.idl
rename to rdf/base/nsIRDFXMLSerializer.idl

rename from rdf/base/idl/nsIRDFXMLSink.idl
rename to rdf/base/nsIRDFXMLSink.idl

rename from rdf/base/idl/nsIRDFXMLSource.idl
rename to rdf/base/nsIRDFXMLSource.idl

rename from rdf/base/src/nsInMemoryDataSource.cpp
rename to rdf/base/nsInMemoryDataSource.cpp

rename from rdf/base/src/nsNameSpaceMap.cpp
rename to rdf/base/nsNameSpaceMap.cpp

rename from rdf/base/src/nsNameSpaceMap.h
rename to rdf/base/nsNameSpaceMap.h

rename from rdf/base/src/nsRDFBaseDataSources.h
rename to rdf/base/nsRDFBaseDataSources.h

rename from rdf/base/src/nsRDFContainer.cpp
rename to rdf/base/nsRDFContainer.cpp

rename from rdf/base/src/nsRDFContainerUtils.cpp
rename to rdf/base/nsRDFContainerUtils.cpp

rename from rdf/base/src/nsRDFContentSink.cpp
rename to rdf/base/nsRDFContentSink.cpp

rename from rdf/base/src/nsRDFContentSinkAtomList.h
rename to rdf/base/nsRDFContentSinkAtomList.h

rename from rdf/base/src/nsRDFService.cpp
rename to rdf/base/nsRDFService.cpp

rename from rdf/base/src/nsRDFService.h
rename to rdf/base/nsRDFService.h

rename from rdf/base/src/nsRDFXMLDataSource.cpp
rename to rdf/base/nsRDFXMLDataSource.cpp

rename from rdf/base/src/nsRDFXMLParser.cpp
rename to rdf/base/nsRDFXMLParser.cpp

rename from rdf/base/src/nsRDFXMLParser.h
rename to rdf/base/nsRDFXMLParser.h

rename from rdf/base/src/nsRDFXMLSerializer.cpp
rename to rdf/base/nsRDFXMLSerializer.cpp

rename from rdf/base/src/nsRDFXMLSerializer.h
rename to rdf/base/nsRDFXMLSerializer.h

deleted file mode 100644
--- a/rdf/base/public/moz.build
+++ /dev/null
@@ -1,11 +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 += [
-    'nsIRDFContentSink.h',
-    'rdf.h',
-]
-

rename from rdf/base/public/rdf.h
rename to rdf/base/rdf.h

rename from rdf/base/idl/rdfIDataSource.idl
rename to rdf/base/rdfIDataSource.idl

rename from rdf/base/idl/rdfISerializer.idl
rename to rdf/base/rdfISerializer.idl

rename from rdf/base/idl/rdfITripleVisitor.idl
rename to rdf/base/rdfITripleVisitor.idl

rename from rdf/base/src/rdfTriplesSerializer.cpp
rename to rdf/base/rdfTriplesSerializer.cpp

rename from rdf/base/src/rdfutil.cpp
rename to rdf/base/rdfutil.cpp

rename from rdf/base/src/rdfutil.h
rename to rdf/base/rdfutil.h

deleted file mode 100644
--- a/rdf/base/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 += [
-    'nsCompositeDataSource.cpp',
-    'nsContainerEnumerator.cpp',
-    'nsDefaultResourceFactory.cpp',
-    'nsInMemoryDataSource.cpp',
-    'nsNameSpaceMap.cpp',
-    'nsRDFContainer.cpp',
-    'nsRDFContainerUtils.cpp',
-    'nsRDFContentSink.cpp',
-    'nsRDFService.cpp',
-    'nsRDFXMLDataSource.cpp',
-    'nsRDFXMLParser.cpp',
-    'nsRDFXMLSerializer.cpp',
-    'rdfTriplesSerializer.cpp',
-    'rdfutil.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-FINAL_LIBRARY = 'rdf'

--- a/rdf/build/moz.build
+++ b/rdf/build/moz.build
@@ -12,12 +12,11 @@ SOURCES += [
     'nsRDFModule.cpp',
 ]
 
 LIBRARY_NAME = 'rdf'
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../base/src',
-    '../content/src',
-    '../datasource/src',
+    '/rdf/base',
+    '/rdf/datasource',
 ]

--- a/rdf/datasource/moz.build
+++ b/rdf/datasource/moz.build
@@ -1,7 +1,22 @@
 # -*- 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']
+EXPORTS += [
+    'nsILocalStore.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsFileSystemDataSource.cpp',
+    'nsLocalStore.cpp',
+]
+
+FINAL_LIBRARY = 'rdf'
+
+# "This is a dependency on rdfutil.h: it'll go away once that becomes
+# a first-class XPCOM interface."
+LOCAL_INCLUDES += [
+    '/rdf/base',
+]

rename from rdf/datasource/src/nsFileSystemDataSource.cpp
rename to rdf/datasource/nsFileSystemDataSource.cpp

rename from rdf/datasource/src/nsFileSystemDataSource.h
rename to rdf/datasource/nsFileSystemDataSource.h

rename from rdf/datasource/public/nsILocalStore.h
rename to rdf/datasource/nsILocalStore.h

rename from rdf/datasource/public/nsIRDFFTP.h
rename to rdf/datasource/nsIRDFFTP.h

rename from rdf/datasource/src/nsLocalStore.cpp
rename to rdf/datasource/nsLocalStore.cpp

rename from rdf/datasource/src/nsRDFBuiltInDataSources.h
rename to rdf/datasource/nsRDFBuiltInDataSources.h

deleted file mode 100644
--- a/rdf/datasource/public/moz.build
+++ /dev/null
@@ -1,10 +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 += [
-    'nsILocalStore.h',
-]
-

deleted file mode 100644
--- a/rdf/datasource/src/moz.build
+++ /dev/null
@@ -1,19 +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 += [
-    'nsFileSystemDataSource.cpp',
-    'nsLocalStore.cpp',
-]
-
-FINAL_LIBRARY = 'rdf'
-
-# "This is a dependency on rdfutil.h: it'll go away once that becomes
-# a first-class XPCOM interface."
-LOCAL_INCLUDES += [
-    '../../base/src',
-]
-

rename from rdf/util/src/Makefile.in
rename to rdf/util/Makefile.in

rename from rdf/util/src/internal/moz.build
rename to rdf/util/internal/moz.build

--- a/rdf/util/moz.build
+++ b/rdf/util/moz.build
@@ -1,8 +1,20 @@
 # -*- 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']
+DIRS += ['internal']
+
+EXPORTS += [
+    'nsRDFResource.h',
+]
 
+include('objs.mozbuild')
+
+SOURCES += rdf_util_src_cppsrcs
+
+LIBRARY_NAME = 'rdfutil_external_s'
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+FORCE_STATIC_LIB = True

rename from rdf/util/src/nsRDFResource.cpp
rename to rdf/util/nsRDFResource.cpp

rename from rdf/util/public/nsRDFResource.h
rename to rdf/util/nsRDFResource.h

rename from rdf/util/src/objs.mozbuild
rename to rdf/util/objs.mozbuild
--- a/rdf/util/src/objs.mozbuild
+++ b/rdf/util/objs.mozbuild
@@ -4,10 +4,10 @@
 # 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/.
 
 rdf_util_src_lcppsrcs = [
     'nsRDFResource.cpp',
 ]
 
 rdf_util_src_cppsrcs = [
-    '%s/rdf/util/src/%s' % (TOPSRCDIR, s) for s in rdf_util_src_lcppsrcs
+    '%s/rdf/util/%s' % (TOPSRCDIR, s) for s in rdf_util_src_lcppsrcs
 ]

deleted file mode 100644
--- a/rdf/util/public/moz.build
+++ /dev/null
@@ -1,10 +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 += [
-    'nsRDFResource.h',
-]
-

deleted file mode 100644
--- a/rdf/util/src/moz.build
+++ /dev/null
@@ -1,16 +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/.
-
-DIRS += ['internal']
-
-include('objs.mozbuild')
-
-SOURCES += rdf_util_src_cppsrcs
-
-LIBRARY_NAME = 'rdfutil_external_s'
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = True