--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -146,23 +146,23 @@ SHARED_LIBRARY_LIBS = \
 ifdef MOZ_MEDIA
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/content/media/video/src/$(LIB_PREFIX)gkconvideo_s.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
 ifdef MOZ_OGG
 SHARED_LIBRARY_LIBS 	+= \
-	$(DEPTH)/modules/libfishsound/src/libfishsound/$(LIB_PREFIX)fishsound.$(LIB_SUFFIX) \
-	$(DEPTH)/modules/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
-	$(DEPTH)/modules/liboggplay/src/liboggplay/$(LIB_PREFIX)oggplay.$(LIB_SUFFIX) \
-	$(DEPTH)/modules/liboggz/src/liboggz/$(LIB_PREFIX)oggz.$(LIB_SUFFIX) \
-	$(DEPTH)/modules/liboggplay_audio/$(LIB_PREFIX)oggplay_audio.$(LIB_SUFFIX) \
-	$(DEPTH)/modules/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
-	$(DEPTH)/modules/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
+	$(DEPTH)/media/libfishsound/src/libfishsound/$(LIB_PREFIX)fishsound.$(LIB_SUFFIX) \
+	$(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
+	$(DEPTH)/media/liboggplay/src/liboggplay/$(LIB_PREFIX)oggplay.$(LIB_SUFFIX) \
+	$(DEPTH)/media/liboggz/src/liboggz/$(LIB_PREFIX)oggz.$(LIB_SUFFIX) \
+	$(DEPTH)/media/liboggplay_audio/$(LIB_PREFIX)oggplay_audio.$(LIB_SUFFIX) \
+	$(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
+	$(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
 ifdef NS_PRINTING
 SHARED_LIBRARY_LIBS += \
 		../printing/$(LIB_PREFIX)gkprinting_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif

rename from modules/libfishsound/AUTHORS
rename to media/libfishsound/AUTHORS

rename from modules/libfishsound/COPYING
rename to media/libfishsound/COPYING

rename from modules/libfishsound/ChangeLog
rename to media/libfishsound/ChangeLog

rename from modules/libfishsound/Makefile.in
rename to media/libfishsound/Makefile.in

rename from modules/libfishsound/README
rename to media/libfishsound/README

rename from modules/libfishsound/README_MOZILLA
rename to media/libfishsound/README_MOZILLA

rename from modules/libfishsound/include/Makefile.in
rename to media/libfishsound/include/Makefile.in

rename from modules/libfishsound/include/fishsound/Makefile.in
rename to media/libfishsound/include/fishsound/Makefile.in

rename from modules/libfishsound/include/fishsound/comments.h
rename to media/libfishsound/include/fishsound/comments.h

rename from modules/libfishsound/include/fishsound/config.h
rename to media/libfishsound/include/fishsound/config.h

rename from modules/libfishsound/include/fishsound/constants.h
rename to media/libfishsound/include/fishsound/constants.h

rename from modules/libfishsound/include/fishsound/decode.h
rename to media/libfishsound/include/fishsound/decode.h

rename from modules/libfishsound/include/fishsound/deprecated.h
rename to media/libfishsound/include/fishsound/deprecated.h

rename from modules/libfishsound/include/fishsound/encode.h
rename to media/libfishsound/include/fishsound/encode.h

rename from modules/libfishsound/include/fishsound/fishsound.h
rename to media/libfishsound/include/fishsound/fishsound.h

rename from modules/libfishsound/src/Makefile.in
rename to media/libfishsound/src/Makefile.in

rename from modules/libfishsound/src/libfishsound/Makefile.in
rename to media/libfishsound/src/libfishsound/Makefile.in

rename from modules/libfishsound/src/libfishsound/config.h
rename to media/libfishsound/src/libfishsound/config.h

rename from modules/libfishsound/src/libfishsound/convert.h
rename to media/libfishsound/src/libfishsound/convert.h

rename from modules/libfishsound/src/libfishsound/convert_c.h
rename to media/libfishsound/src/libfishsound/convert_c.h

rename from modules/libfishsound/src/libfishsound/convert_oil.h
rename to media/libfishsound/src/libfishsound/convert_oil.h

rename from modules/libfishsound/src/libfishsound/fishsound.c
rename to media/libfishsound/src/libfishsound/fishsound.c

rename from modules/libfishsound/src/libfishsound/fishsound_comments.c
rename to media/libfishsound/src/libfishsound/fishsound_comments.c

rename from modules/libfishsound/src/libfishsound/fishsound_decode.c
rename to media/libfishsound/src/libfishsound/fishsound_decode.c

rename from modules/libfishsound/src/libfishsound/fishsound_encode.c
rename to media/libfishsound/src/libfishsound/fishsound_encode.c

rename from modules/libfishsound/src/libfishsound/fishsound_flac.c
rename to media/libfishsound/src/libfishsound/fishsound_flac.c

rename from modules/libfishsound/src/libfishsound/fishsound_speex.c
rename to media/libfishsound/src/libfishsound/fishsound_speex.c

rename from modules/libfishsound/src/libfishsound/fishsound_vorbis.c
rename to media/libfishsound/src/libfishsound/fishsound_vorbis.c

rename from modules/libfishsound/src/libfishsound/fs_compat.h
rename to media/libfishsound/src/libfishsound/fs_compat.h

rename from modules/libfishsound/src/libfishsound/fs_vector.c
rename to media/libfishsound/src/libfishsound/fs_vector.c

rename from modules/libfishsound/src/libfishsound/fs_vector.h
rename to media/libfishsound/src/libfishsound/fs_vector.h

rename from modules/libfishsound/src/libfishsound/private.h
rename to media/libfishsound/src/libfishsound/private.h

rename from modules/libfishsound/update.sh
rename to media/libfishsound/update.sh

rename from modules/libogg/AUTHORS
rename to media/libogg/AUTHORS

rename from modules/libogg/CHANGES
rename to media/libogg/CHANGES

rename from modules/libogg/COPYING
rename to media/libogg/COPYING

rename from modules/libogg/Makefile.in
rename to media/libogg/Makefile.in

rename from modules/libogg/README
rename to media/libogg/README

rename from modules/libogg/README_MOZILLA
rename to media/libogg/README_MOZILLA

rename from modules/libogg/include/Makefile.in
rename to media/libogg/include/Makefile.in

rename from modules/libogg/include/ogg/Makefile.in
rename to media/libogg/include/ogg/Makefile.in

rename from modules/libogg/include/ogg/config_types.h
rename to media/libogg/include/ogg/config_types.h

rename from modules/libogg/include/ogg/ogg.h
rename to media/libogg/include/ogg/ogg.h

rename from modules/libogg/include/ogg/os_types.h
rename to media/libogg/include/ogg/os_types.h

rename from modules/libogg/src/Makefile.in
rename to media/libogg/src/Makefile.in

rename from modules/libogg/src/bitwise.c
rename to media/libogg/src/bitwise.c

rename from modules/libogg/src/framing.c
rename to media/libogg/src/framing.c

rename from modules/libogg/src/ogg_bitwise.c
rename to media/libogg/src/ogg_bitwise.c

rename from modules/libogg/src/ogg_framing.c
rename to media/libogg/src/ogg_framing.c

rename from modules/libogg/update.sh
rename to media/libogg/update.sh

rename from modules/liboggplay/Makefile.in
rename to media/liboggplay/Makefile.in

rename from modules/liboggplay/README
rename to media/liboggplay/README

rename from modules/liboggplay/README_MOZILLA
rename to media/liboggplay/README_MOZILLA

rename from modules/liboggplay/include/Makefile.in
rename to media/liboggplay/include/Makefile.in

rename from modules/liboggplay/include/oggplay/Makefile.in
rename to media/liboggplay/include/oggplay/Makefile.in

rename from modules/liboggplay/include/oggplay/config_win32.h
rename to media/liboggplay/include/oggplay/config_win32.h

rename from modules/liboggplay/include/oggplay/oggplay.h
rename to media/liboggplay/include/oggplay/oggplay.h

rename from modules/liboggplay/include/oggplay/oggplay_callback_info.h
rename to media/liboggplay/include/oggplay/oggplay_callback_info.h

rename from modules/liboggplay/include/oggplay/oggplay_enums.h
rename to media/liboggplay/include/oggplay/oggplay_enums.h

rename from modules/liboggplay/include/oggplay/oggplay_query.h
rename to media/liboggplay/include/oggplay/oggplay_query.h

rename from modules/liboggplay/include/oggplay/oggplay_reader.h
rename to media/liboggplay/include/oggplay/oggplay_reader.h

rename from modules/liboggplay/include/oggplay/oggplay_seek.h
rename to media/liboggplay/include/oggplay/oggplay_seek.h

rename from modules/liboggplay/include/oggplay/oggplay_tools.h
rename to media/liboggplay/include/oggplay/oggplay_tools.h

rename from modules/liboggplay/src/Makefile.in
rename to media/liboggplay/src/Makefile.in

rename from modules/liboggplay/src/liboggplay/Makefile.in
rename to media/liboggplay/src/liboggplay/Makefile.in

rename from modules/liboggplay/src/liboggplay/config.h
rename to media/liboggplay/src/liboggplay/config.h

rename from modules/liboggplay/src/liboggplay/oggplay.c
rename to media/liboggplay/src/liboggplay/oggplay.c

rename from modules/liboggplay/src/liboggplay/oggplay_buffer.c
rename to media/liboggplay/src/liboggplay/oggplay_buffer.c

rename from modules/liboggplay/src/liboggplay/oggplay_buffer.h
rename to media/liboggplay/src/liboggplay/oggplay_buffer.h

rename from modules/liboggplay/src/liboggplay/oggplay_callback.c
rename to media/liboggplay/src/liboggplay/oggplay_callback.c

rename from modules/liboggplay/src/liboggplay/oggplay_callback.h
rename to media/liboggplay/src/liboggplay/oggplay_callback.h

rename from modules/liboggplay/src/liboggplay/oggplay_callback_info.c
rename to media/liboggplay/src/liboggplay/oggplay_callback_info.c

rename from modules/liboggplay/src/liboggplay/oggplay_data.c
rename to media/liboggplay/src/liboggplay/oggplay_data.c

rename from modules/liboggplay/src/liboggplay/oggplay_data.h
rename to media/liboggplay/src/liboggplay/oggplay_data.h

rename from modules/liboggplay/src/liboggplay/oggplay_file_reader.c
rename to media/liboggplay/src/liboggplay/oggplay_file_reader.c

rename from modules/liboggplay/src/liboggplay/oggplay_file_reader.h
rename to media/liboggplay/src/liboggplay/oggplay_file_reader.h

rename from modules/liboggplay/src/liboggplay/oggplay_private.h
rename to media/liboggplay/src/liboggplay/oggplay_private.h

rename from modules/liboggplay/src/liboggplay/oggplay_query.c
rename to media/liboggplay/src/liboggplay/oggplay_query.c

rename from modules/liboggplay/src/liboggplay/oggplay_seek.c
rename to media/liboggplay/src/liboggplay/oggplay_seek.c

rename from modules/liboggplay/src/liboggplay/oggplay_tcp_reader.c
rename to media/liboggplay/src/liboggplay/oggplay_tcp_reader.c

rename from modules/liboggplay/src/liboggplay/oggplay_tcp_reader.h
rename to media/liboggplay/src/liboggplay/oggplay_tcp_reader.h

rename from modules/liboggplay/src/liboggplay/oggplay_tools.c
rename to media/liboggplay/src/liboggplay/oggplay_tools.c

rename from modules/liboggplay/src/liboggplay/oggplay_yuv2rgb.c
rename to media/liboggplay/src/liboggplay/oggplay_yuv2rgb.c

rename from modules/liboggplay/src/liboggplay/std_semaphore.h
rename to media/liboggplay/src/liboggplay/std_semaphore.h

rename from modules/liboggplay/update.sh
rename to media/liboggplay/update.sh

rename from modules/liboggplay_audio/Makefile.in
rename to media/liboggplay_audio/Makefile.in

rename from modules/liboggplay_audio/README_MOZILLA
rename to media/liboggplay_audio/README_MOZILLA

rename from modules/liboggplay_audio/sydney_audio.h
rename to media/liboggplay_audio/sydney_audio.h

rename from modules/liboggplay_audio/sydney_audio_alsa.c
rename to media/liboggplay_audio/sydney_audio_alsa.c

rename from modules/liboggplay_audio/sydney_audio_mac.c
rename to media/liboggplay_audio/sydney_audio_mac.c

rename from modules/liboggplay_audio/sydney_audio_oss.c
rename to media/liboggplay_audio/sydney_audio_oss.c

rename from modules/liboggplay_audio/sydney_audio_waveapi.c
rename to media/liboggplay_audio/sydney_audio_waveapi.c

rename from modules/liboggplay_audio/update.sh
rename to media/liboggplay_audio/update.sh

rename from modules/liboggz/AUTHORS
rename to media/liboggz/AUTHORS

rename from modules/liboggz/COPYING
rename to media/liboggz/COPYING

rename from modules/liboggz/ChangeLog
rename to media/liboggz/ChangeLog

rename from modules/liboggz/Makefile.in
rename to media/liboggz/Makefile.in

rename from modules/liboggz/README
rename to media/liboggz/README

rename from modules/liboggz/README_MOZILLA
rename to media/liboggz/README_MOZILLA

rename from modules/liboggz/include/Makefile.in
rename to media/liboggz/include/Makefile.in

rename from modules/liboggz/include/oggz/Makefile.in
rename to media/liboggz/include/oggz/Makefile.in

rename from modules/liboggz/include/oggz/config.h
rename to media/liboggz/include/oggz/config.h

rename from modules/liboggz/include/oggz/config_win32.h
rename to media/liboggz/include/oggz/config_win32.h

rename from modules/liboggz/include/oggz/oggz.h
rename to media/liboggz/include/oggz/oggz.h

rename from modules/liboggz/include/oggz/oggz_comments.h
rename to media/liboggz/include/oggz/oggz_comments.h

rename from modules/liboggz/include/oggz/oggz_constants.h
rename to media/liboggz/include/oggz/oggz_constants.h

rename from modules/liboggz/include/oggz/oggz_deprecated.h
rename to media/liboggz/include/oggz/oggz_deprecated.h

rename from modules/liboggz/include/oggz/oggz_io.h
rename to media/liboggz/include/oggz/oggz_io.h

rename from modules/liboggz/include/oggz/oggz_off_t.h
rename to media/liboggz/include/oggz/oggz_off_t.h

rename from modules/liboggz/include/oggz/oggz_off_t_generated.h
rename to media/liboggz/include/oggz/oggz_off_t_generated.h

rename from modules/liboggz/include/oggz/oggz_read.h
rename to media/liboggz/include/oggz/oggz_read.h

rename from modules/liboggz/include/oggz/oggz_seek.h
rename to media/liboggz/include/oggz/oggz_seek.h

rename from modules/liboggz/include/oggz/oggz_stream.h
rename to media/liboggz/include/oggz/oggz_stream.h

rename from modules/liboggz/include/oggz/oggz_table.h
rename to media/liboggz/include/oggz/oggz_table.h

rename from modules/liboggz/include/oggz/oggz_write.h
rename to media/liboggz/include/oggz/oggz_write.h

rename from modules/liboggz/src/Makefile.in
rename to media/liboggz/src/Makefile.in

rename from modules/liboggz/src/liboggz/Makefile.in
rename to media/liboggz/src/liboggz/Makefile.in

rename from modules/liboggz/src/liboggz/metric_internal.c
rename to media/liboggz/src/liboggz/metric_internal.c

rename from modules/liboggz/src/liboggz/oggz.c
rename to media/liboggz/src/liboggz/oggz.c

rename from modules/liboggz/src/liboggz/oggz_auto.c
rename to media/liboggz/src/liboggz/oggz_auto.c

rename from modules/liboggz/src/liboggz/oggz_auto.h
rename to media/liboggz/src/liboggz/oggz_auto.h

rename from modules/liboggz/src/liboggz/oggz_byteorder.h
rename to media/liboggz/src/liboggz/oggz_byteorder.h

rename from modules/liboggz/src/liboggz/oggz_comments.c
rename to media/liboggz/src/liboggz/oggz_comments.c

rename from modules/liboggz/src/liboggz/oggz_compat.h
rename to media/liboggz/src/liboggz/oggz_compat.h

rename from modules/liboggz/src/liboggz/oggz_dlist.c
rename to media/liboggz/src/liboggz/oggz_dlist.c

rename from modules/liboggz/src/liboggz/oggz_dlist.h
rename to media/liboggz/src/liboggz/oggz_dlist.h

rename from modules/liboggz/src/liboggz/oggz_io.c
rename to media/liboggz/src/liboggz/oggz_io.c

rename from modules/liboggz/src/liboggz/oggz_macros.h
rename to media/liboggz/src/liboggz/oggz_macros.h

rename from modules/liboggz/src/liboggz/oggz_private.h
rename to media/liboggz/src/liboggz/oggz_private.h

rename from modules/liboggz/src/liboggz/oggz_read.c
rename to media/liboggz/src/liboggz/oggz_read.c

rename from modules/liboggz/src/liboggz/oggz_seek.c
rename to media/liboggz/src/liboggz/oggz_seek.c

rename from modules/liboggz/src/liboggz/oggz_stream.c
rename to media/liboggz/src/liboggz/oggz_stream.c

rename from modules/liboggz/src/liboggz/oggz_stream.h
rename to media/liboggz/src/liboggz/oggz_stream.h

rename from modules/liboggz/src/liboggz/oggz_stream_private.h
rename to media/liboggz/src/liboggz/oggz_stream_private.h

rename from modules/liboggz/src/liboggz/oggz_table.c
rename to media/liboggz/src/liboggz/oggz_table.c

rename from modules/liboggz/src/liboggz/oggz_vector.c
rename to media/liboggz/src/liboggz/oggz_vector.c

rename from modules/liboggz/src/liboggz/oggz_vector.h
rename to media/liboggz/src/liboggz/oggz_vector.h

rename from modules/liboggz/src/liboggz/oggz_write.c
rename to media/liboggz/src/liboggz/oggz_write.c

rename from modules/liboggz/update.sh
rename to media/liboggz/update.sh

rename from modules/libtheora/AUTHORS
rename to media/libtheora/AUTHORS

rename from modules/libtheora/CHANGES
rename to media/libtheora/CHANGES

rename from modules/libtheora/COPYING
rename to media/libtheora/COPYING

rename from modules/libtheora/LICENSE
rename to media/libtheora/LICENSE

rename from modules/libtheora/Makefile.in
rename to media/libtheora/Makefile.in

rename from modules/libtheora/README
rename to media/libtheora/README

rename from modules/libtheora/README_MOZILLA
rename to media/libtheora/README_MOZILLA

rename from modules/libtheora/changeset_r15144.diff
rename to media/libtheora/changeset_r15144.diff

rename from modules/libtheora/include/Makefile.in
rename to media/libtheora/include/Makefile.in

rename from modules/libtheora/include/theora/Makefile.in
rename to media/libtheora/include/theora/Makefile.in

rename from modules/libtheora/include/theora/codec.h
rename to media/libtheora/include/theora/codec.h

rename from modules/libtheora/include/theora/config.h
rename to media/libtheora/include/theora/config.h

rename from modules/libtheora/include/theora/theora.h
rename to media/libtheora/include/theora/theora.h

rename from modules/libtheora/include/theora/theoradec.h
rename to media/libtheora/include/theora/theoradec.h

rename from modules/libtheora/lib/Makefile.in
rename to media/libtheora/lib/Makefile.in

rename from modules/libtheora/lib/config.h
rename to media/libtheora/lib/config.h

rename from modules/libtheora/lib/cpu.c
rename to media/libtheora/lib/cpu.c

rename from modules/libtheora/lib/cpu.h
rename to media/libtheora/lib/cpu.h

rename from modules/libtheora/lib/dec/apiwrapper.c
rename to media/libtheora/lib/dec/apiwrapper.c

rename from modules/libtheora/lib/dec/apiwrapper.h
rename to media/libtheora/lib/dec/apiwrapper.h

rename from modules/libtheora/lib/dec/bitwise.c
rename to media/libtheora/lib/dec/bitwise.c

rename from modules/libtheora/lib/dec/bitwise.h
rename to media/libtheora/lib/dec/bitwise.h

rename from modules/libtheora/lib/dec/dct.h
rename to media/libtheora/lib/dec/dct.h

rename from modules/libtheora/lib/dec/decapiwrapper.c
rename to media/libtheora/lib/dec/decapiwrapper.c

rename from modules/libtheora/lib/dec/decinfo.c
rename to media/libtheora/lib/dec/decinfo.c

rename from modules/libtheora/lib/dec/decint.h
rename to media/libtheora/lib/dec/decint.h

rename from modules/libtheora/lib/dec/decode.c
rename to media/libtheora/lib/dec/decode.c

rename from modules/libtheora/lib/dec/dequant.c
rename to media/libtheora/lib/dec/dequant.c

rename from modules/libtheora/lib/dec/dequant.h
rename to media/libtheora/lib/dec/dequant.h

rename from modules/libtheora/lib/dec/enquant.h
rename to media/libtheora/lib/dec/enquant.h

rename from modules/libtheora/lib/dec/fragment.c
rename to media/libtheora/lib/dec/fragment.c

rename from modules/libtheora/lib/dec/huffdec.c
rename to media/libtheora/lib/dec/huffdec.c

rename from modules/libtheora/lib/dec/huffdec.h
rename to media/libtheora/lib/dec/huffdec.h

rename from modules/libtheora/lib/dec/huffman.h
rename to media/libtheora/lib/dec/huffman.h

rename from modules/libtheora/lib/dec/idct.c
rename to media/libtheora/lib/dec/idct.c

rename from modules/libtheora/lib/dec/idct.h
rename to media/libtheora/lib/dec/idct.h

rename from modules/libtheora/lib/dec/info.c
rename to media/libtheora/lib/dec/info.c

rename from modules/libtheora/lib/dec/internal.c
rename to media/libtheora/lib/dec/internal.c

rename from modules/libtheora/lib/dec/ocintrin.h
rename to media/libtheora/lib/dec/ocintrin.h

rename from modules/libtheora/lib/dec/quant.c
rename to media/libtheora/lib/dec/quant.c

rename from modules/libtheora/lib/dec/quant.h
rename to media/libtheora/lib/dec/quant.h

rename from modules/libtheora/lib/dec/state.c
rename to media/libtheora/lib/dec/state.c

rename from modules/libtheora/lib/dec/x86/mmxfrag.c
rename to media/libtheora/lib/dec/x86/mmxfrag.c

rename from modules/libtheora/lib/dec/x86/mmxidct.c
rename to media/libtheora/lib/dec/x86/mmxidct.c

rename from modules/libtheora/lib/dec/x86/mmxstate.c
rename to media/libtheora/lib/dec/x86/mmxstate.c

rename from modules/libtheora/lib/dec/x86/x86int.h
rename to media/libtheora/lib/dec/x86/x86int.h

rename from modules/libtheora/lib/dec/x86/x86state.c
rename to media/libtheora/lib/dec/x86/x86state.c

rename from modules/libtheora/lib/internal.h
rename to media/libtheora/lib/internal.h

rename from modules/libtheora/update.sh
rename to media/libtheora/update.sh

rename from modules/libvorbis/AUTHORS
rename to media/libvorbis/AUTHORS

rename from modules/libvorbis/COPYING
rename to media/libvorbis/COPYING

rename from modules/libvorbis/Makefile.in
rename to media/libvorbis/Makefile.in

rename from modules/libvorbis/README
rename to media/libvorbis/README

rename from modules/libvorbis/README_MOZILLA
rename to media/libvorbis/README_MOZILLA

rename from modules/libvorbis/include/Makefile.in
rename to media/libvorbis/include/Makefile.in

rename from modules/libvorbis/include/vorbis/Makefile.in
rename to media/libvorbis/include/vorbis/Makefile.in

rename from modules/libvorbis/include/vorbis/codec.h
rename to media/libvorbis/include/vorbis/codec.h

rename from modules/libvorbis/lib/Makefile.in
rename to media/libvorbis/lib/Makefile.in

rename from modules/libvorbis/lib/backends.h
rename to media/libvorbis/lib/backends.h

rename from modules/libvorbis/lib/bitrate.h
rename to media/libvorbis/lib/bitrate.h

rename from modules/libvorbis/lib/codebook.h
rename to media/libvorbis/lib/codebook.h

rename from modules/libvorbis/lib/codec_internal.h
rename to media/libvorbis/lib/codec_internal.h

rename from modules/libvorbis/lib/envelope.h
rename to media/libvorbis/lib/envelope.h

rename from modules/libvorbis/lib/highlevel.h
rename to media/libvorbis/lib/highlevel.h

rename from modules/libvorbis/lib/lookup.h
rename to media/libvorbis/lib/lookup.h

rename from modules/libvorbis/lib/lookup_data.h
rename to media/libvorbis/lib/lookup_data.h

rename from modules/libvorbis/lib/lpc.h
rename to media/libvorbis/lib/lpc.h

rename from modules/libvorbis/lib/lsp.h
rename to media/libvorbis/lib/lsp.h

rename from modules/libvorbis/lib/masking.h
rename to media/libvorbis/lib/masking.h

rename from modules/libvorbis/lib/mdct.h
rename to media/libvorbis/lib/mdct.h

rename from modules/libvorbis/lib/misc.h
rename to media/libvorbis/lib/misc.h

rename from modules/libvorbis/lib/os.h
rename to media/libvorbis/lib/os.h

rename from modules/libvorbis/lib/psy.h
rename to media/libvorbis/lib/psy.h

rename from modules/libvorbis/lib/registry.h
rename to media/libvorbis/lib/registry.h

rename from modules/libvorbis/lib/scales.h
rename to media/libvorbis/lib/scales.h

rename from modules/libvorbis/lib/smallft.h
rename to media/libvorbis/lib/smallft.h

rename from modules/libvorbis/lib/vorbis_analysis.c
rename to media/libvorbis/lib/vorbis_analysis.c

rename from modules/libvorbis/lib/vorbis_bitrate.c
rename to media/libvorbis/lib/vorbis_bitrate.c

rename from modules/libvorbis/lib/vorbis_block.c
rename to media/libvorbis/lib/vorbis_block.c

rename from modules/libvorbis/lib/vorbis_codebook.c
rename to media/libvorbis/lib/vorbis_codebook.c

rename from modules/libvorbis/lib/vorbis_envelope.c
rename to media/libvorbis/lib/vorbis_envelope.c

rename from modules/libvorbis/lib/vorbis_floor0.c
rename to media/libvorbis/lib/vorbis_floor0.c

rename from modules/libvorbis/lib/vorbis_floor1.c
rename to media/libvorbis/lib/vorbis_floor1.c

rename from modules/libvorbis/lib/vorbis_info.c
rename to media/libvorbis/lib/vorbis_info.c

rename from modules/libvorbis/lib/vorbis_lookup.c
rename to media/libvorbis/lib/vorbis_lookup.c

rename from modules/libvorbis/lib/vorbis_lpc.c
rename to media/libvorbis/lib/vorbis_lpc.c

rename from modules/libvorbis/lib/vorbis_lsp.c
rename to media/libvorbis/lib/vorbis_lsp.c

rename from modules/libvorbis/lib/vorbis_mapping0.c
rename to media/libvorbis/lib/vorbis_mapping0.c

rename from modules/libvorbis/lib/vorbis_mdct.c
rename to media/libvorbis/lib/vorbis_mdct.c

rename from modules/libvorbis/lib/vorbis_psy.c
rename to media/libvorbis/lib/vorbis_psy.c

rename from modules/libvorbis/lib/vorbis_registry.c
rename to media/libvorbis/lib/vorbis_registry.c

rename from modules/libvorbis/lib/vorbis_res0.c
rename to media/libvorbis/lib/vorbis_res0.c

rename from modules/libvorbis/lib/vorbis_sharedbook.c
rename to media/libvorbis/lib/vorbis_sharedbook.c

rename from modules/libvorbis/lib/vorbis_smallft.c
rename to media/libvorbis/lib/vorbis_smallft.c

rename from modules/libvorbis/lib/vorbis_synthesis.c
rename to media/libvorbis/lib/vorbis_synthesis.c

rename from modules/libvorbis/lib/vorbis_window.c
rename to media/libvorbis/lib/vorbis_window.c

rename from modules/libvorbis/lib/window.h
rename to media/libvorbis/lib/window.h

rename from modules/libvorbis/todo.txt
rename to media/libvorbis/todo.txt

rename from modules/libvorbis/update.sh
rename to media/libvorbis/update.sh

--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -278,62 +278,62 @@ MAKEFILES_libpref="
 
 MAKEFILES_libutil="
   modules/libutil/Makefile
   modules/libutil/public/Makefile
   modules/libutil/src/Makefile
 "
 
 MAKEFILES_libvorbis="
-  modules/libvorbis/Makefile
-  modules/libvorbis/lib/Makefile
-  modules/libvorbis/include/Makefile
-  modules/libvorbis/include/vorbis/Makefile
+  media/libvorbis/Makefile
+  media/libvorbis/lib/Makefile
+  media/libvorbis/include/Makefile
+  media/libvorbis/include/vorbis/Makefile
 "
 
 MAKEFILES_libtheora="
-  modules/libtheora/Makefile
-  modules/libtheora/lib/Makefile
-  modules/libtheora/include/Makefile
-  modules/libtheora/include/theora/Makefile
+  media/libtheora/Makefile
+  media/libtheora/lib/Makefile
+  media/libtheora/include/Makefile
+  media/libtheora/include/theora/Makefile
 "
 
 MAKEFILES_liboggz="
-  modules/liboggz/Makefile
-  modules/liboggz/src/Makefile
-  modules/liboggz/src/liboggz/Makefile
-  modules/liboggz/include/Makefile
-  modules/liboggz/include/oggz/Makefile
+  media/liboggz/Makefile
+  media/liboggz/src/Makefile
+  media/liboggz/src/liboggz/Makefile
+  media/liboggz/include/Makefile
+  media/liboggz/include/oggz/Makefile
 "
 
 MAKEFILES_libogg="
-  modules/libogg/Makefile
-  modules/libogg/src/Makefile
-  modules/libogg/include/Makefile
-  modules/libogg/include/ogg/Makefile
+  media/libogg/Makefile
+  media/libogg/src/Makefile
+  media/libogg/include/Makefile
+  media/libogg/include/ogg/Makefile
 "
 
 MAKEFILES_libfishsound="
-  modules/libfishsound/Makefile
-  modules/libfishsound/src/Makefile
-  modules/libfishsound/src/libfishsound/Makefile
-  modules/libfishsound/include/Makefile
-  modules/libfishsound/include/fishsound/Makefile
+  media/libfishsound/Makefile
+  media/libfishsound/src/Makefile
+  media/libfishsound/src/libfishsound/Makefile
+  media/libfishsound/include/Makefile
+  media/libfishsound/include/fishsound/Makefile
 "
 
 MAKEFILES_liboggplay="
-  modules/liboggplay/Makefile
-  modules/liboggplay/src/Makefile
-  modules/liboggplay/src/liboggplay/Makefile
-  modules/liboggplay/include/Makefile
-  modules/liboggplay/include/oggplay/Makefile
+  media/liboggplay/Makefile
+  media/liboggplay/src/Makefile
+  media/liboggplay/src/liboggplay/Makefile
+  media/liboggplay/include/Makefile
+  media/liboggplay/include/oggplay/Makefile
 "
 
 MAKEFILES_liboggplay_audio="
-  modules/liboggplay_audio/Makefile
+  media/liboggplay_audio/Makefile
 "
 
 MAKEFILES_oji="
   modules/oji/Makefile
   modules/oji/public/Makefile
   modules/oji/src/Makefile
   plugin/oji/JEP/Makefile
 "

--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -113,23 +113,23 @@ tier_gecko_dirs += rdf
 endif
 
 ifdef MOZ_JSDEBUGGER
 tier_gecko_dirs += js/jsd
 endif
 
 ifdef MOZ_OGG
 tier_gecko_dirs += \
-		modules/libfishsound \
-		modules/libogg \
-		modules/liboggplay \
-		modules/liboggplay_audio \
-		modules/liboggz \
-		modules/libtheora \
-		modules/libvorbis \
+		media/libfishsound \
+		media/libogg \
+		media/liboggplay \
+		media/liboggplay_audio \
+		media/liboggz \
+		media/libtheora \
+		media/libvorbis \
 		$(NULL)
 endif
 
 tier_gecko_dirs	+= \
 		uriloader \
 		modules/libimg \
 		caps \
 		parser/expat \