--- a/configure.in
+++ b/configure.in
@@ -1293,17 +1293,17 @@ MOZ_USER_DIR=".mozilla"
 
 MOZ_JPEG_CFLAGS=
 MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/media/libjpeg)'
 MOZ_ZLIB_CFLAGS=
 MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/modules/zlib/src)'
 MOZ_BZ2_CFLAGS=
 MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/modules/libbz2/src)'
 MOZ_PNG_CFLAGS=
-MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/modules/libimg/png)'
+MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
 
 MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
 MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
 DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
 MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
 XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
 LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
 XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
@@ -2287,17 +2287,17 @@ ia64*-hpux*)
             PROFILE_USE_CFLAGS="-GL -wd4624 -wd4952"
             dnl XXX: should be -LTCG:PGOPTIMIZE, but that fails on libxul.
             dnl Probably also a compiler bug, but what can you do?
             PROFILE_USE_LDFLAGS="-LTCG:PGUPDATE"
             LDFLAGS="$LDFLAGS -DYNAMICBASE"
         fi
     fi
     MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,jpeg32$(VERSION_NUMBER),$(DEPTH)/media/libjpeg)'
-    MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/modules/libimg/png)'
+    MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,png,$(DEPTH)/media/libpng)'
     AC_DEFINE(HAVE_SNPRINTF)
     AC_DEFINE(_WINDOWS)
     AC_DEFINE(WIN32)
     AC_DEFINE(XP_WIN)
     AC_DEFINE(XP_WIN32)
     AC_DEFINE(HW_THREADS)
     AC_DEFINE(STDC_HEADERS)
     AC_DEFINE(NEW_H, <new>)

rename from modules/libimg/png/CHANGES
rename to media/libpng/CHANGES

rename from modules/libimg/png/LICENSE
rename to media/libpng/LICENSE

rename from modules/libimg/png/MOZCHANGES
rename to media/libpng/MOZCHANGES

rename from modules/libimg/png/Makefile.in
rename to media/libpng/Makefile.in
--- a/modules/libimg/png/Makefile.in
+++ b/media/libpng/Makefile.in
@@ -30,17 +30,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= png
 LIBRARY_NAME	= mozpng

rename from modules/libimg/png/README
rename to media/libpng/README

rename from modules/libimg/png/crashtests/374810-1.html
rename to media/libpng/crashtests/374810-1.html

rename from modules/libimg/png/crashtests/crashtests.list
rename to media/libpng/crashtests/crashtests.list

rename from modules/libimg/png/libpng.txt
rename to media/libpng/libpng.txt

rename from modules/libimg/png/mozpngconf.h
rename to media/libpng/mozpngconf.h

rename from modules/libimg/png/png.c
rename to media/libpng/png.c

rename from modules/libimg/png/png.h
rename to media/libpng/png.h

rename from modules/libimg/png/pngconf.h
rename to media/libpng/pngconf.h

rename from modules/libimg/png/pngerror.c
rename to media/libpng/pngerror.c

rename from modules/libimg/png/pngget.c
rename to media/libpng/pngget.c

rename from modules/libimg/png/pngmem.c
rename to media/libpng/pngmem.c

rename from modules/libimg/png/pngpread.c
rename to media/libpng/pngpread.c

rename from modules/libimg/png/pngpriv.h
rename to media/libpng/pngpriv.h

rename from modules/libimg/png/pngread.c
rename to media/libpng/pngread.c

rename from modules/libimg/png/pngrio.c
rename to media/libpng/pngrio.c

rename from modules/libimg/png/pngrtran.c
rename to media/libpng/pngrtran.c

rename from modules/libimg/png/pngrutil.c
rename to media/libpng/pngrutil.c

rename from modules/libimg/png/pngset.c
rename to media/libpng/pngset.c

rename from modules/libimg/png/pngtrans.c
rename to media/libpng/pngtrans.c

rename from modules/libimg/png/pngwio.c
rename to media/libpng/pngwio.c

rename from modules/libimg/png/pngwrite.c
rename to media/libpng/pngwrite.c

rename from modules/libimg/png/pngwtran.c
rename to media/libpng/pngwtran.c

rename from modules/libimg/png/pngwutil.c
rename to media/libpng/pngwutil.c

--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -54,11 +54,11 @@ include ../../parser/htmlparser/tests/cr
 include ../../security/manager/ssl/crashtests/crashtests.list
 
 include ../../view/crashtests/crashtests.list
 
 include ../../widget/src/cocoa/crashtests/crashtests.list
 include ../../widget/src/gtk2/crashtests/crashtests.list
 include ../../widget/src/crashtests/crashtests.list
 
-include ../../modules/libimg/png/crashtests/crashtests.list
+include ../../media/libpng/crashtests/crashtests.list
 
 include ../../xpcom/string/crashtests/crashtests.list

--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -999,17 +999,17 @@ if test -n "$MOZ_UPDATE_PACKAGING"; then
   add_makefiles "
     tools/update-packaging/Makefile
     other-licenses/bsdiff/Makefile
   "
 fi
 
 if [ ! "$SYSTEM_PNG" ]; then
   add_makefiles "
-    modules/libimg/png/Makefile
+    media/libpng/Makefile
   "
 fi
 
 if [ -f ${srcdir}/l10n/makefiles.all ]; then
   MAKEFILES_langpacks=`cat ${srcdir}/l10n/makefiles.all`
   add_makefiles "
     $MAKEFILES_langpacks
   "

--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -153,17 +153,17 @@ endif
 
 ifdef MOZ_SYDNEYAUDIO
 tier_platform_dirs += \
 		media/libsydneyaudio \
 		$(NULL)
 endif
 
 ifndef MOZ_NATIVE_PNG
-tier_platform_dirs += modules/libimg/png
+tier_platform_dirs += media/libpng
 endif
 
 tier_platform_dirs	+= \
 		uriloader \
 		caps \
 		parser \
 		gfx \
 		modules/libpr0n \

--- a/tools/relic/relic
+++ b/tools/relic/relic
@@ -280,17 +280,17 @@ log = logging.getLogger("relic")
     "java",
     "privacy",
 
     # These have their own BSD-like license
     "media/libjpeg",
     
     # The following are not supposed to be relicensed, but they do have a
     # few files in we care about (like makefiles)
-    "modules/libimg/png",
+    "media/libpng",
     "modules/zlib",
     "gc/boehm",
     "other-licenses",
     
     # Copy of GPLed tool
     "tools/buildbot",
     
     # Other directories we want to exclude