rename from image/public/ImageLogging.h
rename to image/ImageLogging.h

rename from image/public/imgICache.idl
rename to image/imgICache.idl

rename from image/public/imgIContainer.idl
rename to image/imgIContainer.idl

rename from image/public/imgIContainerDebug.idl
rename to image/imgIContainerDebug.idl

rename from image/public/imgIEncoder.idl
rename to image/imgIEncoder.idl

rename from image/public/imgILoader.idl
rename to image/imgILoader.idl

rename from image/public/imgINotificationObserver.idl
rename to image/imgINotificationObserver.idl

rename from image/public/imgIOnloadBlocker.idl
rename to image/imgIOnloadBlocker.idl

rename from image/public/imgIRequest.idl
rename to image/imgIRequest.idl

rename from image/public/imgIScriptedNotificationObserver.idl
rename to image/imgIScriptedNotificationObserver.idl

rename from image/public/imgITools.idl
rename to image/imgITools.idl

--- a/image/moz.build
+++ b/image/moz.build
@@ -1,19 +1,38 @@
 # -*- 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', 'decoders', 'encoders']
-DIRS += ['build']
+DIRS += ['build', 'src', 'decoders', 'encoders']
 
 with Files('**'):
     BUG_COMPONENT = ('Core', 'ImageLib')
 
 BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 
 MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['test/mochitest/chrome.ini']
 
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+
+XPIDL_SOURCES += [
+    'imgICache.idl',
+    'imgIContainer.idl',
+    'imgIContainerDebug.idl',
+    'imgIEncoder.idl',
+    'imgILoader.idl',
+    'imgINotificationObserver.idl',
+    'imgIOnloadBlocker.idl',
+    'imgIRequest.idl',
+    'imgIScriptedNotificationObserver.idl',
+    'imgITools.idl',
+    'nsIIconURI.idl',
+]
+
+XPIDL_MODULE = 'imglib2'
+
+EXPORTS += [
+    'ImageLogging.h',
+]

rename from image/public/nsIIconURI.idl
rename to image/nsIIconURI.idl

deleted file mode 100644
--- a/image/public/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/.
-
-XPIDL_SOURCES += [
-    'imgICache.idl',
-    'imgIContainer.idl',
-    'imgIContainerDebug.idl',
-    'imgIEncoder.idl',
-    'imgILoader.idl',
-    'imgINotificationObserver.idl',
-    'imgIOnloadBlocker.idl',
-    'imgIRequest.idl',
-    'imgIScriptedNotificationObserver.idl',
-    'imgITools.idl',
-    'nsIIconURI.idl',
-]
-
-XPIDL_MODULE = 'imglib2'
-
-EXPORTS += [
-    'ImageLogging.h',
-]
-