diff --git a/accessible/tests/mochitest/Makefile.in b/accessible/tests/mochitest/Makefile.in
index 1180f62d1851..d9f40b50e1e9 100644
--- a/accessible/tests/mochitest/Makefile.in
+++ b/accessible/tests/mochitest/Makefile.in
@@ -48,7 +48,7 @@ include $(topsrcdir)/config/rules.mk
 _TEST_FILES =\
 		letters.gif \
 		moz.png \
-		$(topsrcdir)/content/media/video/test/bug461281.ogg \
+		$(topsrcdir)/content/media/test/bug461281.ogg \
 		longdesc_src.html \
 		actions.js \
 		attributes.js \
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index 20096551dd7a..10eb026e062d 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -41,11 +41,83 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_MEDIA
-DIRS 		= \
-		video \
+MODULE		= content
+LIBRARY_NAME	= gkconmedia_s
+LIBXUL_LIBRARY 	= 1
+
+REQUIRES	= \
+		xpcom \
+		string \
+		gfx \
+		content \
+		thebes \
+		layout \
+		widget \
+		dom \
+		js \
+		locale \
+		unicharutil \
+		webshell \
+		uriloader \
+		htmlparser \
+		necko \
+		view \
+		pref \
+		docshell \
+		xpconnect \
+		xuldoc \
+		caps \
+		editor \
+		imglib2 \
+		mimetype \
+		exthandler \
+		uconv \
+		intl \
+		plugin \
+		cairo \
+		libpixman \
+		$(NULL)
+
+EXPORTS		= \
+		nsMediaDecoder.h \
+		nsMediaStream.h \
+		nsMediaCache.h \
+		$(NULL)
+
+CPPSRCS		= \
+		nsMediaDecoder.cpp \
+		nsMediaCache.cpp \
+		nsMediaStream.cpp \
+		$(NULL)
+
+ifdef MOZ_SYDNEYAUDIO
+EXPORTS		+= \
+		nsAudioStream.h \
+		$(NULL)
+CPPSRCS		+= \
+		nsAudioStream.cpp \
 		$(NULL)
 endif
 
+DIRS =
+
+ifdef MOZ_OGG
+DIRS += ogg
+endif
+
+ifdef MOZ_WAVE
+DIRS += wave
+endif
+
+ifdef ENABLE_TESTS
+DIRS += test
+endif
+
+FORCE_STATIC_LIB = 1
+
 include $(topsrcdir)/config/rules.mk
 
+INCLUDES	+= \
+		-I$(srcdir)/../base/src \
+		-I$(srcdir)/../html/content/src \
+		$(NULL)
diff --git a/content/media/video/src/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
similarity index 100%
rename from content/media/video/src/nsAudioStream.cpp
rename to content/media/nsAudioStream.cpp
diff --git a/content/media/video/public/nsAudioStream.h b/content/media/nsAudioStream.h
similarity index 100%
rename from content/media/video/public/nsAudioStream.h
rename to content/media/nsAudioStream.h
diff --git a/content/media/video/src/nsMediaCache.cpp b/content/media/nsMediaCache.cpp
similarity index 100%
rename from content/media/video/src/nsMediaCache.cpp
rename to content/media/nsMediaCache.cpp
diff --git a/content/media/video/public/nsMediaCache.h b/content/media/nsMediaCache.h
similarity index 100%
rename from content/media/video/public/nsMediaCache.h
rename to content/media/nsMediaCache.h
diff --git a/content/media/video/src/nsMediaDecoder.cpp b/content/media/nsMediaDecoder.cpp
similarity index 100%
rename from content/media/video/src/nsMediaDecoder.cpp
rename to content/media/nsMediaDecoder.cpp
diff --git a/content/media/video/public/nsMediaDecoder.h b/content/media/nsMediaDecoder.h
similarity index 100%
rename from content/media/video/public/nsMediaDecoder.h
rename to content/media/nsMediaDecoder.h
diff --git a/content/media/video/src/nsMediaStream.cpp b/content/media/nsMediaStream.cpp
similarity index 100%
rename from content/media/video/src/nsMediaStream.cpp
rename to content/media/nsMediaStream.cpp
diff --git a/content/media/video/public/nsMediaStream.h b/content/media/nsMediaStream.h
similarity index 100%
rename from content/media/video/public/nsMediaStream.h
rename to content/media/nsMediaStream.h
diff --git a/content/media/video/src/Makefile.in b/content/media/ogg/Makefile.in
similarity index 86%
rename from content/media/video/src/Makefile.in
rename to content/media/ogg/Makefile.in
index f1b4037e3db4..1266088a8100 100644
--- a/content/media/video/src/Makefile.in
+++ b/content/media/ogg/Makefile.in
@@ -34,7 +34,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
-LIBRARY_NAME	= gkconvideo_s
+LIBRARY_NAME	= gkconogg_s
 LIBXUL_LIBRARY 	= 1
 
 REQUIRES	= \
@@ -78,36 +78,21 @@ REQUIRES	= \
 		libpixman \
 		$(NULL)
 
+EXPORTS		+= \
+		nsChannelReader.h \
+		nsOggDecoder.h \
+		$(NULL)
+
 CPPSRCS		= \
-		nsMediaDecoder.cpp \
-		nsMediaCache.cpp \
-		nsMediaStream.cpp \
-		$(NULL)
-
-ifdef MOZ_SYDNEYAUDIO
-CPPSRCS		+= \
-		nsAudioStream.cpp \
-		$(NULL)
-endif
-
-ifdef MOZ_OGG
-CPPSRCS		+= \
 		nsChannelReader.cpp \
 		nsOggDecoder.cpp \
 		$(NULL)
-endif
-
-ifdef MOZ_WAVE
-CPPSRCS		+= \
-		nsWaveDecoder.cpp \
-		$(NULL)
-endif
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
-		-I$(srcdir)/../../../base/src \
-		-I$(srcdir)/../../../html/content/src \
+		-I$(srcdir)/../../base/src \
+		-I$(srcdir)/../../html/content/src \
 		$(NULL)
diff --git a/content/media/video/src/nsChannelReader.cpp b/content/media/ogg/nsChannelReader.cpp
similarity index 100%
rename from content/media/video/src/nsChannelReader.cpp
rename to content/media/ogg/nsChannelReader.cpp
diff --git a/content/media/video/public/nsChannelReader.h b/content/media/ogg/nsChannelReader.h
similarity index 100%
rename from content/media/video/public/nsChannelReader.h
rename to content/media/ogg/nsChannelReader.h
diff --git a/content/media/video/src/nsOggDecoder.cpp b/content/media/ogg/nsOggDecoder.cpp
similarity index 100%
rename from content/media/video/src/nsOggDecoder.cpp
rename to content/media/ogg/nsOggDecoder.cpp
diff --git a/content/media/video/public/nsOggDecoder.h b/content/media/ogg/nsOggDecoder.h
similarity index 100%
rename from content/media/video/public/nsOggDecoder.h
rename to content/media/ogg/nsOggDecoder.h
diff --git a/content/media/video/test/320x240.allow-origin.ogv b/content/media/test/320x240.allow-origin.ogv
similarity index 100%
rename from content/media/video/test/320x240.allow-origin.ogv
rename to content/media/test/320x240.allow-origin.ogv
diff --git a/content/media/video/test/320x240.allow-origin.ogv^headers^ b/content/media/test/320x240.allow-origin.ogv^headers^
similarity index 100%
rename from content/media/video/test/320x240.allow-origin.ogv^headers^
rename to content/media/test/320x240.allow-origin.ogv^headers^
diff --git a/content/media/video/test/320x240.ogv b/content/media/test/320x240.ogv
similarity index 100%
rename from content/media/video/test/320x240.ogv
rename to content/media/test/320x240.ogv
diff --git a/content/media/video/test/Makefile.in b/content/media/test/Makefile.in
similarity index 98%
rename from content/media/video/test/Makefile.in
rename to content/media/test/Makefile.in
index 913f11782271..fea51574fd9e 100644
--- a/content/media/video/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -34,11 +34,11 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = content/media/video/test
+relativesrcdir  = content/media/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/video/test/big.wav b/content/media/test/big.wav
similarity index 100%
rename from content/media/video/test/big.wav
rename to content/media/test/big.wav
diff --git a/content/media/video/test/bug461281.ogg b/content/media/test/bug461281.ogg
similarity index 100%
rename from content/media/video/test/bug461281.ogg
rename to content/media/test/bug461281.ogg
diff --git a/content/media/video/test/bug482461.ogv b/content/media/test/bug482461.ogv
similarity index 100%
rename from content/media/video/test/bug482461.ogv
rename to content/media/test/bug482461.ogv
diff --git a/content/media/video/test/can_play_type_ogg.js b/content/media/test/can_play_type_ogg.js
similarity index 100%
rename from content/media/video/test/can_play_type_ogg.js
rename to content/media/test/can_play_type_ogg.js
diff --git a/content/media/video/test/can_play_type_wave.js b/content/media/test/can_play_type_wave.js
similarity index 100%
rename from content/media/video/test/can_play_type_wave.js
rename to content/media/test/can_play_type_wave.js
diff --git a/content/media/video/test/contentDuration1.sjs b/content/media/test/contentDuration1.sjs
similarity index 94%
rename from content/media/video/test/contentDuration1.sjs
rename to content/media/test/contentDuration1.sjs
index 66b7be866edc..e7b1e0edc992 100644
--- a/content/media/video/test/contentDuration1.sjs
+++ b/content/media/test/contentDuration1.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/video/test/320x240.ogv";
+  var paths = "tests/content/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/video/test/contentDuration2.sjs b/content/media/test/contentDuration2.sjs
similarity index 94%
rename from content/media/video/test/contentDuration2.sjs
rename to content/media/test/contentDuration2.sjs
index 5225b342e143..1b3f141291c1 100644
--- a/content/media/video/test/contentDuration2.sjs
+++ b/content/media/test/contentDuration2.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/video/test/320x240.ogv";
+  var paths = "tests/content/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/video/test/contentDuration3.sjs b/content/media/test/contentDuration3.sjs
similarity index 94%
rename from content/media/video/test/contentDuration3.sjs
rename to content/media/test/contentDuration3.sjs
index d578873edd91..fb4056445cf2 100644
--- a/content/media/video/test/contentDuration3.sjs
+++ b/content/media/test/contentDuration3.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/video/test/320x240.ogv";
+  var paths = "tests/content/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/video/test/contentDuration4.sjs b/content/media/test/contentDuration4.sjs
similarity index 94%
rename from content/media/video/test/contentDuration4.sjs
rename to content/media/test/contentDuration4.sjs
index 1ed32b9a3af1..bcb9bb6822c4 100644
--- a/content/media/video/test/contentDuration4.sjs
+++ b/content/media/test/contentDuration4.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/video/test/320x240.ogv";
+  var paths = "tests/content/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/video/test/contentDuration5.sjs b/content/media/test/contentDuration5.sjs
similarity index 94%
rename from content/media/video/test/contentDuration5.sjs
rename to content/media/test/contentDuration5.sjs
index 3d6cf3b8026e..8f6a2084c5ff 100644
--- a/content/media/video/test/contentDuration5.sjs
+++ b/content/media/test/contentDuration5.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/video/test/320x240.ogv";
+  var paths = "tests/content/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/video/test/contentDuration6.sjs b/content/media/test/contentDuration6.sjs
similarity index 94%
rename from content/media/video/test/contentDuration6.sjs
rename to content/media/test/contentDuration6.sjs
index 9eacef6226e7..f41f93ab4393 100644
--- a/content/media/video/test/contentDuration6.sjs
+++ b/content/media/test/contentDuration6.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/video/test/320x240.ogv";
+  var paths = "tests/content/media/test/320x240.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/video/test/crashtests/468763-1.html b/content/media/test/crashtests/468763-1.html
similarity index 100%
rename from content/media/video/test/crashtests/468763-1.html
rename to content/media/test/crashtests/468763-1.html
diff --git a/content/media/video/test/crashtests/474744-1.html b/content/media/test/crashtests/474744-1.html
similarity index 100%
rename from content/media/video/test/crashtests/474744-1.html
rename to content/media/test/crashtests/474744-1.html
diff --git a/content/media/video/test/crashtests/crashtests.list b/content/media/test/crashtests/crashtests.list
similarity index 100%
rename from content/media/video/test/crashtests/crashtests.list
rename to content/media/test/crashtests/crashtests.list
diff --git a/content/media/video/test/dynamic_redirect.sjs b/content/media/test/dynamic_redirect.sjs
similarity index 94%
rename from content/media/video/test/dynamic_redirect.sjs
rename to content/media/test/dynamic_redirect.sjs
index 69fb751d58e8..cbd1d7a8ade4 100644
--- a/content/media/video/test/dynamic_redirect.sjs
+++ b/content/media/test/dynamic_redirect.sjs
@@ -7,7 +7,7 @@ function handleRequest(request, response)
   if (getState(key[1]) == "redirect") {
     var origin = request.host == "localhost" ? "example.org" : "localhost:8888";
     response.setStatusLine(request.httpVersion, 303, "See Other");
-    response.setHeader("Location", "http://" + origin + "/tests/content/media/video/test/seek.ogv");
+    response.setHeader("Location", "http://" + origin + "/tests/content/media/test/seek.ogv");
     response.setHeader("Content-Type", "text/html");
     return;
   }
@@ -21,7 +21,7 @@ function handleRequest(request, response)
                         createInstance(Components.interfaces.nsIFileInputStream);
   var bis  = Components.classes["@mozilla.org/binaryinputstream;1"].
                         createInstance(Components.interfaces.nsIBinaryInputStream);
-  var paths = "tests/content/media/video/test/seek.ogv";
+  var paths = "tests/content/media/test/seek.ogv";
   var split = paths.split("/");
   for(var i = 0; i < split.length; ++i) {
     file.append(split[i]);
diff --git a/content/media/video/test/file_access_controls.html b/content/media/test/file_access_controls.html
similarity index 80%
rename from content/media/video/test/file_access_controls.html
rename to content/media/test/file_access_controls.html
index c377ace8fed2..bfb7370d4685 100644
--- a/content/media/video/test/file_access_controls.html
+++ b/content/media/test/file_access_controls.html
@@ -4,67 +4,67 @@
 <body onload="setTimeout(load, 0);" onunload="done()">
 <script>
 
-// Page URL: http://example.org/tests/content/media/video/test/file_access_controls.html
+// Page URL: http://example.org/tests/content/media/test/file_access_controls.html
 
 var gTests = [
   {
     // Test 0
-    url: "redirect.sjs?http://example.com/tests/content/media/video/test/320x240.ogv",
+    url: "redirect.sjs?http://example.com/tests/content/media/test/320x240.ogv",
     result: "error",
     description: "Won't load when redirected to different domain",
   },{
     // Test 1
-    url: "redirect.sjs?http://example.com/tests/content/media/video/test/320x240.allow-origin.ogv",
+    url: "redirect.sjs?http://example.com/tests/content/media/test/320x240.allow-origin.ogv",
     result: "loaded",
     description: "Can load when redirected to different domain with allow-origin",
   },{
     // Test 2
-    url: "redirect.sjs?http://test1.example.org/tests/content/media/video/test/320x240.ogv",
+    url: "redirect.sjs?http://test1.example.org/tests/content/media/test/320x240.ogv",
     result: "error",
     description: "Won't load when redirected to subdomain",
   },{
     // Test 3
-    url: "redirect.sjs?http://test1.example.org/tests/content/media/video/test/320x240.allow-origin.ogv",
+    url: "redirect.sjs?http://test1.example.org/tests/content/media/test/320x240.allow-origin.ogv",
     result: "loaded",
     description: "Can load when redirected to subdomain with allow-origin",
   },{
     // Test 4
-    url: "redirect.sjs?http://example.org/tests/content/media/video/test/320x240.ogv",
+    url: "redirect.sjs?http://example.org/tests/content/media/test/320x240.ogv",
     result: "loaded",
     description: "Can load when redirected to same domain",
   },{
     // Test 5
-    url: "http://example.org/tests/content/media/video/test/320x240.ogv",
+    url: "http://example.org/tests/content/media/test/320x240.ogv",
     result: "loaded",
     description: "Can load from same domain"
   },{
     // Test 6
-    url: "http://example.org:8000/tests/content/media/video/test/320x240.ogv",
+    url: "http://example.org:8000/tests/content/media/test/320x240.ogv",
     result: "error",
     description: "Won't load from differnet port on same domain"
   },{
     // Test 7
-    url: "http://example.org:8000/tests/content/media/video/test/320x240.allow-origin.ogv",
+    url: "http://example.org:8000/tests/content/media/test/320x240.allow-origin.ogv",
     result: "loaded",
     description: "Can load from different port on same domain with allow-origin",
   },{
     // Test 8
-    url: "http://example.com/tests/content/media/video/test/320x240.ogv",
+    url: "http://example.com/tests/content/media/test/320x240.ogv",
     result: "error",
     description: "Won't load cross domain",
   },{
     // Test 9
-    url: "http://example.com/tests/content/media/video/test/320x240.allow-origin.ogv",
+    url: "http://example.com/tests/content/media/test/320x240.allow-origin.ogv",
     result: "loaded",
     description: "Can load cross domain with allow-origin",
   },{
     // Test 10
-    url: "http://test1.example.org/tests/content/media/video/test/320x240.allow-origin.ogv",
+    url: "http://test1.example.org/tests/content/media/test/320x240.allow-origin.ogv",
     result: "loaded",
     description: "Can load from subdomain with allow-origin",
   },{
     // Test 11
-    url: "http://test1.example.org/tests/content/media/video/test/320x240.ogv",
+    url: "http://test1.example.org/tests/content/media/test/320x240.ogv",
     result: "error",
     description: "Won't load from subdomain",
   }
@@ -95,7 +95,7 @@ function createVideo() {
 function load() {
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   opener.is(window.location.href,
-            "http://example.org/tests/content/media/video/test/file_access_controls.html",
+            "http://example.org/tests/content/media/test/file_access_controls.html",
             "We must be on a example.org:80");
  
   // Ensure access control check pref is on.
diff --git a/content/media/video/test/r11025_s16_c1.wav b/content/media/test/r11025_s16_c1.wav
similarity index 100%
rename from content/media/video/test/r11025_s16_c1.wav
rename to content/media/test/r11025_s16_c1.wav
diff --git a/content/media/video/test/r11025_s16_c1_trailing.wav b/content/media/test/r11025_s16_c1_trailing.wav
similarity index 100%
rename from content/media/video/test/r11025_s16_c1_trailing.wav
rename to content/media/test/r11025_s16_c1_trailing.wav
diff --git a/content/media/video/test/r11025_u8_c1.wav b/content/media/test/r11025_u8_c1.wav
similarity index 100%
rename from content/media/video/test/r11025_u8_c1.wav
rename to content/media/test/r11025_u8_c1.wav
diff --git a/content/media/video/test/r11025_u8_c1_trunc.wav b/content/media/test/r11025_u8_c1_trunc.wav
similarity index 100%
rename from content/media/video/test/r11025_u8_c1_trunc.wav
rename to content/media/test/r11025_u8_c1_trunc.wav
diff --git a/content/media/video/test/r16000_u8_c1_list.wav b/content/media/test/r16000_u8_c1_list.wav
similarity index 100%
rename from content/media/video/test/r16000_u8_c1_list.wav
rename to content/media/test/r16000_u8_c1_list.wav
diff --git a/content/media/video/test/redirect.sjs b/content/media/test/redirect.sjs
similarity index 100%
rename from content/media/video/test/redirect.sjs
rename to content/media/test/redirect.sjs
diff --git a/content/media/video/test/seek.ogv b/content/media/test/seek.ogv
similarity index 100%
rename from content/media/video/test/seek.ogv
rename to content/media/test/seek.ogv
diff --git a/content/media/video/test/small-shot.ogg b/content/media/test/small-shot.ogg
similarity index 100%
rename from content/media/video/test/small-shot.ogg
rename to content/media/test/small-shot.ogg
diff --git a/content/media/video/test/sound.ogg b/content/media/test/sound.ogg
similarity index 100%
rename from content/media/video/test/sound.ogg
rename to content/media/test/sound.ogg
diff --git a/content/media/video/test/test_access_control.html b/content/media/test/test_access_control.html
similarity index 86%
rename from content/media/video/test/test_access_control.html
rename to content/media/test/test_access_control.html
index d20a6890559a..0b487e44c7e9 100644
--- a/content/media/video/test/test_access_control.html
+++ b/content/media/test/test_access_control.html
@@ -20,7 +20,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=451958
 /** Test for Bug 451958 **/
 
 function run() {
-  window.open("http://example.org:80/tests/content/media/video/test/file_access_controls.html", "", "width=500,height=500");
+  window.open("http://example.org:80/tests/content/media/test/file_access_controls.html", "", "width=500,height=500");
 }
 
 function done() {
diff --git a/content/media/video/test/test_audio1.html b/content/media/test/test_audio1.html
similarity index 100%
rename from content/media/video/test/test_audio1.html
rename to content/media/test/test_audio1.html
diff --git a/content/media/video/test/test_audio2.html b/content/media/test/test_audio2.html
similarity index 100%
rename from content/media/video/test/test_audio2.html
rename to content/media/test/test_audio2.html
diff --git a/content/media/video/test/test_audioDocumentTitle.html b/content/media/test/test_audioDocumentTitle.html
similarity index 100%
rename from content/media/video/test/test_audioDocumentTitle.html
rename to content/media/test/test_audioDocumentTitle.html
diff --git a/content/media/video/test/test_autobuffer.html b/content/media/test/test_autobuffer.html
similarity index 100%
rename from content/media/video/test/test_autobuffer.html
rename to content/media/test/test_autobuffer.html
diff --git a/content/media/video/test/test_autobuffer2.html b/content/media/test/test_autobuffer2.html
similarity index 100%
rename from content/media/video/test/test_autobuffer2.html
rename to content/media/test/test_autobuffer2.html
diff --git a/content/media/video/test/test_autoplay.html b/content/media/test/test_autoplay.html
similarity index 100%
rename from content/media/video/test/test_autoplay.html
rename to content/media/test/test_autoplay.html
diff --git a/content/media/video/test/test_bug448534.html b/content/media/test/test_bug448534.html
similarity index 100%
rename from content/media/video/test/test_bug448534.html
rename to content/media/test/test_bug448534.html
diff --git a/content/media/video/test/test_bug461281.html b/content/media/test/test_bug461281.html
similarity index 100%
rename from content/media/video/test/test_bug461281.html
rename to content/media/test/test_bug461281.html
diff --git a/content/media/video/test/test_bug463162.xhtml b/content/media/test/test_bug463162.xhtml
similarity index 100%
rename from content/media/video/test/test_bug463162.xhtml
rename to content/media/test/test_bug463162.xhtml
diff --git a/content/media/video/test/test_bug465498.html b/content/media/test/test_bug465498.html
similarity index 100%
rename from content/media/video/test/test_bug465498.html
rename to content/media/test/test_bug465498.html
diff --git a/content/media/video/test/test_bug468190.html b/content/media/test/test_bug468190.html
similarity index 100%
rename from content/media/video/test/test_bug468190.html
rename to content/media/test/test_bug468190.html
diff --git a/content/media/video/test/test_bug468190_wav.html b/content/media/test/test_bug468190_wav.html
similarity index 100%
rename from content/media/video/test/test_bug468190_wav.html
rename to content/media/test/test_bug468190_wav.html
diff --git a/content/media/video/test/test_bug476973.html b/content/media/test/test_bug476973.html
similarity index 100%
rename from content/media/video/test/test_bug476973.html
rename to content/media/test/test_bug476973.html
diff --git a/content/media/video/test/test_bug482461.html b/content/media/test/test_bug482461.html
similarity index 100%
rename from content/media/video/test/test_bug482461.html
rename to content/media/test/test_bug482461.html
diff --git a/content/media/video/test/test_bug493187.html b/content/media/test/test_bug493187.html
similarity index 100%
rename from content/media/video/test/test_bug493187.html
rename to content/media/test/test_bug493187.html
diff --git a/content/media/video/test/test_bug495145.html b/content/media/test/test_bug495145.html
similarity index 100%
rename from content/media/video/test/test_bug495145.html
rename to content/media/test/test_bug495145.html
diff --git a/content/media/video/test/test_bug495145_wav.html b/content/media/test/test_bug495145_wav.html
similarity index 100%
rename from content/media/video/test/test_bug495145_wav.html
rename to content/media/test/test_bug495145_wav.html
diff --git a/content/media/video/test/test_bug495300.html b/content/media/test/test_bug495300.html
similarity index 100%
rename from content/media/video/test/test_bug495300.html
rename to content/media/test/test_bug495300.html
diff --git a/content/media/video/test/test_bug495319.html b/content/media/test/test_bug495319.html
similarity index 100%
rename from content/media/video/test/test_bug495319.html
rename to content/media/test/test_bug495319.html
diff --git a/content/media/video/test/test_can_play_type.html b/content/media/test/test_can_play_type.html
similarity index 100%
rename from content/media/video/test/test_can_play_type.html
rename to content/media/test/test_can_play_type.html
diff --git a/content/media/video/test/test_can_play_type_no_ogg.html b/content/media/test/test_can_play_type_no_ogg.html
similarity index 100%
rename from content/media/video/test/test_can_play_type_no_ogg.html
rename to content/media/test/test_can_play_type_no_ogg.html
diff --git a/content/media/video/test/test_can_play_type_no_wave.html b/content/media/test/test_can_play_type_no_wave.html
similarity index 100%
rename from content/media/video/test/test_can_play_type_no_wave.html
rename to content/media/test/test_can_play_type_no_wave.html
diff --git a/content/media/video/test/test_can_play_type_ogg.html b/content/media/test/test_can_play_type_ogg.html
similarity index 100%
rename from content/media/video/test/test_can_play_type_ogg.html
rename to content/media/test/test_can_play_type_ogg.html
diff --git a/content/media/video/test/test_can_play_type_wave.html b/content/media/test/test_can_play_type_wave.html
similarity index 100%
rename from content/media/video/test/test_can_play_type_wave.html
rename to content/media/test/test_can_play_type_wave.html
diff --git a/content/media/video/test/test_closing_connections.html b/content/media/test/test_closing_connections.html
similarity index 100%
rename from content/media/video/test/test_closing_connections.html
rename to content/media/test/test_closing_connections.html
diff --git a/content/media/video/test/test_constants.html b/content/media/test/test_constants.html
similarity index 100%
rename from content/media/video/test/test_constants.html
rename to content/media/test/test_constants.html
diff --git a/content/media/video/test/test_contentDuration1.html b/content/media/test/test_contentDuration1.html
similarity index 100%
rename from content/media/video/test/test_contentDuration1.html
rename to content/media/test/test_contentDuration1.html
diff --git a/content/media/video/test/test_contentDuration2.html b/content/media/test/test_contentDuration2.html
similarity index 100%
rename from content/media/video/test/test_contentDuration2.html
rename to content/media/test/test_contentDuration2.html
diff --git a/content/media/video/test/test_contentDuration3.html b/content/media/test/test_contentDuration3.html
similarity index 100%
rename from content/media/video/test/test_contentDuration3.html
rename to content/media/test/test_contentDuration3.html
diff --git a/content/media/video/test/test_contentDuration4.html b/content/media/test/test_contentDuration4.html
similarity index 100%
rename from content/media/video/test/test_contentDuration4.html
rename to content/media/test/test_contentDuration4.html
diff --git a/content/media/video/test/test_contentDuration5.html b/content/media/test/test_contentDuration5.html
similarity index 100%
rename from content/media/video/test/test_contentDuration5.html
rename to content/media/test/test_contentDuration5.html
diff --git a/content/media/video/test/test_contentDuration6.html b/content/media/test/test_contentDuration6.html
similarity index 100%
rename from content/media/video/test/test_contentDuration6.html
rename to content/media/test/test_contentDuration6.html
diff --git a/content/media/video/test/test_controls.html b/content/media/test/test_controls.html
similarity index 100%
rename from content/media/video/test/test_controls.html
rename to content/media/test/test_controls.html
diff --git a/content/media/video/test/test_currentTime.html b/content/media/test/test_currentTime.html
similarity index 100%
rename from content/media/video/test/test_currentTime.html
rename to content/media/test/test_currentTime.html
diff --git a/content/media/video/test/test_decoder_disable.html b/content/media/test/test_decoder_disable.html
similarity index 100%
rename from content/media/video/test/test_decoder_disable.html
rename to content/media/test/test_decoder_disable.html
diff --git a/content/media/video/test/test_delay_load.html b/content/media/test/test_delay_load.html
similarity index 97%
rename from content/media/video/test/test_delay_load.html
rename to content/media/test/test_delay_load.html
index fe0bd59bc58c..0ef016329824 100644
--- a/content/media/video/test/test_delay_load.html
+++ b/content/media/test/test_delay_load.html
@@ -77,7 +77,7 @@ function createVideo(id) {
       v.addEventListener(t, listener, false);
     }
   }
-  v.src = "http://localhost:8888/tests/content/media/video/test/320x240.ogv";
+  v.src = "http://localhost:8888/tests/content/media/test/320x240.ogv";
   register(v);
   return v;
 }
diff --git a/content/media/video/test/test_duration1.html b/content/media/test/test_duration1.html
similarity index 100%
rename from content/media/video/test/test_duration1.html
rename to content/media/test/test_duration1.html
diff --git a/content/media/video/test/test_ended1.html b/content/media/test/test_ended1.html
similarity index 100%
rename from content/media/video/test/test_ended1.html
rename to content/media/test/test_ended1.html
diff --git a/content/media/video/test/test_ended2.html b/content/media/test/test_ended2.html
similarity index 100%
rename from content/media/video/test/test_ended2.html
rename to content/media/test/test_ended2.html
diff --git a/content/media/video/test/test_error_on_404.html b/content/media/test/test_error_on_404.html
similarity index 100%
rename from content/media/video/test/test_error_on_404.html
rename to content/media/test/test_error_on_404.html
diff --git a/content/media/video/test/test_info_leak.html b/content/media/test/test_info_leak.html
similarity index 89%
rename from content/media/video/test/test_info_leak.html
rename to content/media/test/test_info_leak.html
index 54395424eac2..6a3ea04ad1df 100644
--- a/content/media/video/test/test_info_leak.html
+++ b/content/media/test/test_info_leak.html
@@ -48,22 +48,22 @@ var gMedia = null;
 var gTests = [
   {
     tag: 'video',
-    src: fileUriToSrc("tests/content/media/video/test/320x240.ogv", true),
+    src: fileUriToSrc("tests/content/media/test/320x240.ogv", true),
   },{
     tag: 'video',
-    src: fileUriToSrc("tests/content/media/video/test/404.ogv", false),
+    src: fileUriToSrc("tests/content/media/test/404.ogv", false),
   }, {
     tag: 'audio',
-    src: fileUriToSrc("tests/content/media/video/test/r11025_s16_c1.wav", true),
+    src: fileUriToSrc("tests/content/media/test/r11025_s16_c1.wav", true),
   }, {
     tag: 'audio',
-    src: fileUriToSrc("tests/content/media/video/test/404.wav", false),
+    src: fileUriToSrc("tests/content/media/test/404.wav", false),
   }, {
     tag: 'audio',
-    src: fileUriToSrc("tests/content/media/video/test/bug461281.ogg", true),
+    src: fileUriToSrc("tests/content/media/test/bug461281.ogg", true),
   }, {
     tag: 'audio',
-    src: fileUriToSrc("tests/content/media/video/test/404.ogg", false),
+    src: fileUriToSrc("tests/content/media/test/404.ogg", false),
   }, {
     tag: 'video',
     src: 'http://localhost/404.ogv',
@@ -72,10 +72,10 @@ var gTests = [
     src: 'http://localhost/404.wav',
   }, {
     tag: 'video',
-    src: 'http://example.com/tests/content/media/video/test/test_info_leak.html'
+    src: 'http://example.com/tests/content/media/test/test_info_leak.html'
   }, {
     tag: 'audio',
-    src: 'http://example.com/tests/content/media/video/test/test_info_leak.html'
+    src: 'http://example.com/tests/content/media/test/test_info_leak.html'
   }
 ];
 
diff --git a/content/media/video/test/test_load.html b/content/media/test/test_load.html
similarity index 100%
rename from content/media/video/test/test_load.html
rename to content/media/test/test_load.html
diff --git a/content/media/video/test/test_load_candidates.html b/content/media/test/test_load_candidates.html
similarity index 100%
rename from content/media/video/test/test_load_candidates.html
rename to content/media/test/test_load_candidates.html
diff --git a/content/media/video/test/test_media_selection.html b/content/media/test/test_media_selection.html
similarity index 100%
rename from content/media/video/test/test_media_selection.html
rename to content/media/test/test_media_selection.html
diff --git a/content/media/video/test/test_mixed_principals.html b/content/media/test/test_mixed_principals.html
similarity index 91%
rename from content/media/video/test/test_mixed_principals.html
rename to content/media/test/test_mixed_principals.html
index 8178798d373c..076d264b9083 100644
--- a/content/media/video/test/test_mixed_principals.html
+++ b/content/media/test/test_mixed_principals.html
@@ -53,12 +53,12 @@ var key = Math.floor(Math.random()*100000000);
 
 // In v1, try loading from same-origin first and then getting redirected to
 // another origin.
-v1.src = "http://localhost:8888/tests/content/media/video/test/dynamic_redirect.sjs?key=v1_" + key;
+v1.src = "http://localhost:8888/tests/content/media/test/dynamic_redirect.sjs?key=v1_" + key;
 v1.load();
 
 // In v2, try loading cross-origin first and then getting redirected to
 // our origin.
-v2.src = "http://example.org/tests/content/media/video/test/dynamic_redirect.sjs?key=v2_" + key;
+v2.src = "http://example.org/tests/content/media/test/dynamic_redirect.sjs?key=v2_" + key;
 v2.load();
 
 </script>
diff --git a/content/media/video/test/test_networkState.html b/content/media/test/test_networkState.html
similarity index 100%
rename from content/media/video/test/test_networkState.html
rename to content/media/test/test_networkState.html
diff --git a/content/media/video/test/test_onloadedmetadata.html b/content/media/test/test_onloadedmetadata.html
similarity index 100%
rename from content/media/video/test/test_onloadedmetadata.html
rename to content/media/test/test_onloadedmetadata.html
diff --git a/content/media/video/test/test_paused.html b/content/media/test/test_paused.html
similarity index 100%
rename from content/media/video/test/test_paused.html
rename to content/media/test/test_paused.html
diff --git a/content/media/video/test/test_paused_after_ended.html b/content/media/test/test_paused_after_ended.html
similarity index 100%
rename from content/media/video/test/test_paused_after_ended.html
rename to content/media/test/test_paused_after_ended.html
diff --git a/content/media/video/test/test_play.html b/content/media/test/test_play.html
similarity index 100%
rename from content/media/video/test/test_play.html
rename to content/media/test/test_play.html
diff --git a/content/media/video/test/test_progress1.html b/content/media/test/test_progress1.html
similarity index 100%
rename from content/media/video/test/test_progress1.html
rename to content/media/test/test_progress1.html
diff --git a/content/media/video/test/test_progress2.html b/content/media/test/test_progress2.html
similarity index 100%
rename from content/media/video/test/test_progress2.html
rename to content/media/test/test_progress2.html
diff --git a/content/media/video/test/test_progress3.html b/content/media/test/test_progress3.html
similarity index 100%
rename from content/media/video/test/test_progress3.html
rename to content/media/test/test_progress3.html
diff --git a/content/media/video/test/test_progress4.html b/content/media/test/test_progress4.html
similarity index 100%
rename from content/media/video/test/test_progress4.html
rename to content/media/test/test_progress4.html
diff --git a/content/media/video/test/test_readyState.html b/content/media/test/test_readyState.html
similarity index 100%
rename from content/media/video/test/test_readyState.html
rename to content/media/test/test_readyState.html
diff --git a/content/media/video/test/test_seek1.html b/content/media/test/test_seek1.html
similarity index 100%
rename from content/media/video/test/test_seek1.html
rename to content/media/test/test_seek1.html
diff --git a/content/media/video/test/test_seek2.html b/content/media/test/test_seek2.html
similarity index 100%
rename from content/media/video/test/test_seek2.html
rename to content/media/test/test_seek2.html
diff --git a/content/media/video/test/test_seek3.html b/content/media/test/test_seek3.html
similarity index 100%
rename from content/media/video/test/test_seek3.html
rename to content/media/test/test_seek3.html
diff --git a/content/media/video/test/test_seek4.html b/content/media/test/test_seek4.html
similarity index 100%
rename from content/media/video/test/test_seek4.html
rename to content/media/test/test_seek4.html
diff --git a/content/media/video/test/test_seek5.html b/content/media/test/test_seek5.html
similarity index 100%
rename from content/media/video/test/test_seek5.html
rename to content/media/test/test_seek5.html
diff --git a/content/media/video/test/test_seek6.html b/content/media/test/test_seek6.html
similarity index 100%
rename from content/media/video/test/test_seek6.html
rename to content/media/test/test_seek6.html
diff --git a/content/media/video/test/test_seek7.html b/content/media/test/test_seek7.html
similarity index 100%
rename from content/media/video/test/test_seek7.html
rename to content/media/test/test_seek7.html
diff --git a/content/media/video/test/test_seek8.html b/content/media/test/test_seek8.html
similarity index 100%
rename from content/media/video/test/test_seek8.html
rename to content/media/test/test_seek8.html
diff --git a/content/media/video/test/test_seek9.html b/content/media/test/test_seek9.html
similarity index 100%
rename from content/media/video/test/test_seek9.html
rename to content/media/test/test_seek9.html
diff --git a/content/media/video/test/test_source.html b/content/media/test/test_source.html
similarity index 100%
rename from content/media/video/test/test_source.html
rename to content/media/test/test_source.html
diff --git a/content/media/video/test/test_source_write.html b/content/media/test/test_source_write.html
similarity index 100%
rename from content/media/video/test/test_source_write.html
rename to content/media/test/test_source_write.html
diff --git a/content/media/video/test/test_standalone.html b/content/media/test/test_standalone.html
similarity index 100%
rename from content/media/video/test/test_standalone.html
rename to content/media/test/test_standalone.html
diff --git a/content/media/video/test/test_timeupdate1.html b/content/media/test/test_timeupdate1.html
similarity index 100%
rename from content/media/video/test/test_timeupdate1.html
rename to content/media/test/test_timeupdate1.html
diff --git a/content/media/video/test/test_timeupdate2.html b/content/media/test/test_timeupdate2.html
similarity index 100%
rename from content/media/video/test/test_timeupdate2.html
rename to content/media/test/test_timeupdate2.html
diff --git a/content/media/video/test/test_timeupdate3.html b/content/media/test/test_timeupdate3.html
similarity index 100%
rename from content/media/video/test/test_timeupdate3.html
rename to content/media/test/test_timeupdate3.html
diff --git a/content/media/video/test/test_videoDocumentTitle.html b/content/media/test/test_videoDocumentTitle.html
similarity index 100%
rename from content/media/video/test/test_videoDocumentTitle.html
rename to content/media/test/test_videoDocumentTitle.html
diff --git a/content/media/video/test/test_volume.html b/content/media/test/test_volume.html
similarity index 100%
rename from content/media/video/test/test_volume.html
rename to content/media/test/test_volume.html
diff --git a/content/media/video/test/test_wav_8bit.html b/content/media/test/test_wav_8bit.html
similarity index 100%
rename from content/media/video/test/test_wav_8bit.html
rename to content/media/test/test_wav_8bit.html
diff --git a/content/media/video/test/test_wav_ended1.html b/content/media/test/test_wav_ended1.html
similarity index 100%
rename from content/media/video/test/test_wav_ended1.html
rename to content/media/test/test_wav_ended1.html
diff --git a/content/media/video/test/test_wav_ended2.html b/content/media/test/test_wav_ended2.html
similarity index 100%
rename from content/media/video/test/test_wav_ended2.html
rename to content/media/test/test_wav_ended2.html
diff --git a/content/media/video/test/test_wav_list.html b/content/media/test/test_wav_list.html
similarity index 100%
rename from content/media/video/test/test_wav_list.html
rename to content/media/test/test_wav_list.html
diff --git a/content/media/video/test/test_wav_onloadedmetadata.html b/content/media/test/test_wav_onloadedmetadata.html
similarity index 100%
rename from content/media/video/test/test_wav_onloadedmetadata.html
rename to content/media/test/test_wav_onloadedmetadata.html
diff --git a/content/media/video/test/test_wav_seek1.html b/content/media/test/test_wav_seek1.html
similarity index 100%
rename from content/media/video/test/test_wav_seek1.html
rename to content/media/test/test_wav_seek1.html
diff --git a/content/media/video/test/test_wav_seek3.html b/content/media/test/test_wav_seek3.html
similarity index 100%
rename from content/media/video/test/test_wav_seek3.html
rename to content/media/test/test_wav_seek3.html
diff --git a/content/media/video/test/test_wav_seek4.html b/content/media/test/test_wav_seek4.html
similarity index 100%
rename from content/media/video/test/test_wav_seek4.html
rename to content/media/test/test_wav_seek4.html
diff --git a/content/media/video/test/test_wav_seek5.html b/content/media/test/test_wav_seek5.html
similarity index 100%
rename from content/media/video/test/test_wav_seek5.html
rename to content/media/test/test_wav_seek5.html
diff --git a/content/media/video/test/test_wav_seek6.html b/content/media/test/test_wav_seek6.html
similarity index 100%
rename from content/media/video/test/test_wav_seek6.html
rename to content/media/test/test_wav_seek6.html
diff --git a/content/media/video/test/test_wav_seek7.html b/content/media/test/test_wav_seek7.html
similarity index 100%
rename from content/media/video/test/test_wav_seek7.html
rename to content/media/test/test_wav_seek7.html
diff --git a/content/media/video/test/test_wav_seek8.html b/content/media/test/test_wav_seek8.html
similarity index 100%
rename from content/media/video/test/test_wav_seek8.html
rename to content/media/test/test_wav_seek8.html
diff --git a/content/media/video/test/test_wav_seek_past_end.html b/content/media/test/test_wav_seek_past_end.html
similarity index 100%
rename from content/media/video/test/test_wav_seek_past_end.html
rename to content/media/test/test_wav_seek_past_end.html
diff --git a/content/media/video/test/test_wav_seek_then_play.html b/content/media/test/test_wav_seek_then_play.html
similarity index 100%
rename from content/media/video/test/test_wav_seek_then_play.html
rename to content/media/test/test_wav_seek_then_play.html
diff --git a/content/media/video/test/test_wav_standalone.html b/content/media/test/test_wav_standalone.html
similarity index 100%
rename from content/media/video/test/test_wav_standalone.html
rename to content/media/test/test_wav_standalone.html
diff --git a/content/media/video/test/test_wav_timeupdate1.html b/content/media/test/test_wav_timeupdate1.html
similarity index 100%
rename from content/media/video/test/test_wav_timeupdate1.html
rename to content/media/test/test_wav_timeupdate1.html
diff --git a/content/media/video/test/test_wav_timeupdate2.html b/content/media/test/test_wav_timeupdate2.html
similarity index 100%
rename from content/media/video/test/test_wav_timeupdate2.html
rename to content/media/test/test_wav_timeupdate2.html
diff --git a/content/media/video/test/test_wav_trailing.html b/content/media/test/test_wav_trailing.html
similarity index 100%
rename from content/media/video/test/test_wav_trailing.html
rename to content/media/test/test_wav_trailing.html
diff --git a/content/media/video/test/test_wav_trunc.html b/content/media/test/test_wav_trunc.html
similarity index 100%
rename from content/media/video/test/test_wav_trunc.html
rename to content/media/test/test_wav_trunc.html
diff --git a/content/media/video/test/test_wav_trunc_seek.html b/content/media/test/test_wav_trunc_seek.html
similarity index 100%
rename from content/media/video/test/test_wav_trunc_seek.html
rename to content/media/test/test_wav_trunc_seek.html
diff --git a/content/media/video/test/use_large_cache.js b/content/media/test/use_large_cache.js
similarity index 100%
rename from content/media/video/test/use_large_cache.js
rename to content/media/test/use_large_cache.js
diff --git a/content/media/video/Makefile.in b/content/media/video/Makefile.in
deleted file mode 100644
index af07844ea05a..000000000000
--- a/content/media/video/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla code.
-#
-# The Initial Developer of the Original Code is the Mozilla Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Chris Double <chris.double@double.co.nz>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# 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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-PARALLEL_DIRS	= \
-		public \
-		src \
-		$(NULL)
-
-ifdef ENABLE_TESTS
-DIRS            += test
-endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/content/media/video/public/Makefile.in b/content/media/wave/Makefile.in
similarity index 77%
rename from content/media/video/public/Makefile.in
rename to content/media/wave/Makefile.in
index e8116eadf162..3e52abdff997 100644
--- a/content/media/video/public/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -34,7 +34,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -42,30 +42,55 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
+LIBRARY_NAME	= gkconwave_s
+LIBXUL_LIBRARY 	= 1
 
-EXPORTS		= \
-		nsMediaDecoder.h \
-		nsMediaStream.h \
-		nsMediaCache.h \
+REQUIRES	= \
+		xpcom \
+		string \
+		gfx \
+		content \
+		thebes \
+		layout \
+		widget \
+		dom \
+		js \
+		locale \
+		unicharutil \
+		webshell \
+		uriloader \
+		htmlparser \
+		necko \
+		view \
+		pref \
+		docshell \
+		xpconnect \
+		xuldoc \
+		caps \
+		editor \
+		imglib2 \
+		mimetype \
+		exthandler \
+		uconv \
+		intl \
+		plugin \
+		cairo \
+		libpixman \
 		$(NULL)
 
-ifdef MOZ_SYDNEYAUDIO
-EXPORTS		+= \
-		nsAudioStream.h \
-		$(NULL)
-endif
-
-ifdef MOZ_OGG
-EXPORTS		+= \
-		nsChannelReader.h \
-		nsOggDecoder.h \
-		$(NULL)
-endif
-
-ifdef MOZ_WAVE
 EXPORTS		+= \
 		nsWaveDecoder.h \
 		$(NULL)
-endif
+
+CPPSRCS		= \
+		nsWaveDecoder.cpp \
+		$(NULL)
+
+FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= \
+		-I$(srcdir)/../../base/src \
+		-I$(srcdir)/../../html/content/src \
+		$(NULL)
diff --git a/content/media/video/src/nsWaveDecoder.cpp b/content/media/wave/nsWaveDecoder.cpp
similarity index 100%
rename from content/media/video/src/nsWaveDecoder.cpp
rename to content/media/wave/nsWaveDecoder.cpp
diff --git a/content/media/video/public/nsWaveDecoder.h b/content/media/wave/nsWaveDecoder.h
similarity index 100%
rename from content/media/video/public/nsWaveDecoder.h
rename to content/media/wave/nsWaveDecoder.h
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index 6aad99a5b99b..fe09deb12004 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -143,7 +143,7 @@ SHARED_LIBRARY_LIBS = \
 
 ifdef MOZ_MEDIA
 SHARED_LIBRARY_LIBS 	+= \
-	$(DEPTH)/content/media/video/src/$(LIB_PREFIX)gkconvideo_s.$(LIB_SUFFIX) \
+	$(DEPTH)/content/media/$(LIB_PREFIX)gkconmedia_s.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
@@ -155,6 +155,13 @@ SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/media/liboggz/src/liboggz/$(LIB_PREFIX)oggz.$(LIB_SUFFIX) \
 	$(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
 	$(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
+	$(DEPTH)/content/media/ogg/$(LIB_PREFIX)gkconogg_s.$(LIB_SUFFIX) \
+	$(NULL)
+endif
+
+ifdef MOZ_WAVE
+SHARED_LIBRARY_LIBS 	+= \
+	$(DEPTH)/content/media/wave/$(LIB_PREFIX)gkconwave_s.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
diff --git a/testing/crashtest/crashtests.list b/testing/crashtest/crashtests.list
index 8648aa262ad7..bbfe4225cf0f 100644
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -17,7 +17,7 @@ include ../../content/xul/content/crashtests/crashtests.list
 include ../../content/xul/document/crashtests/crashtests.list
 include ../../content/xul/templates/src/crashtests/crashtests.list
 include ../../content/mathml/content/crashtests/crashtests.list
-include ../../content/media/video/test/crashtests/crashtests.list
+include ../../content/media/test/crashtests/crashtests.list
 
 include ../../docshell/base/crashtests/crashtests.list
 
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index cec8729cc5a7..243d38b81ea2 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -1053,10 +1053,7 @@ fi # MOZ_COMPONENTLIB
 if [ "$MOZ_MEDIA" ]; then
  add_makefiles "
    content/media/Makefile
-   content/media/video/Makefile
-   content/media/video/public/Makefile
-   content/media/video/src/Makefile
-   content/media/video/test/Makefile
+   content/media/test/Makefile
  "
 fi
 
@@ -1068,6 +1065,13 @@ if [ "$MOZ_OGG" ]; then
    $MAKEFILES_libogg
    $MAKEFILES_libfishsound
    $MAKEFILES_liboggplay
+   content/media/ogg/Makefile
+ "
+fi
+
+if [ "$MOZ_WAVE" ]; then
+ add_makefiles "
+   content/media/wave/Makefile
  "
 fi