Remove the `servo-` prefix from core components.

215 files changed, 59 insertions, 55 deletions

diff --git a/Makefile.in b/Makefile.in
index b4145a0186c..a025ec1ce30 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -171,35 +171,35 @@ $(eval $(call DEF_SUBMODULE_RULES,$(submodule))))
 
 DONE_SUBMODULES = $(foreach submodule,$(SUBMODULES),$(DONE_$(submodule)))
 
-RFLAGS_servo_util = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES))
-SRC_servo_util = $(call rwildcard,$(S)src/components/servo-util/,*.rs)
-CRATE_servo_util = $(S)src/components/servo-util/servo_util.rc
-DONE_servo_util = $(B)src/components/servo-util/libservoutil.dummy
+RFLAGS_util = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES))
+SRC_util = $(call rwildcard,$(S)src/components/util/,*.rs)
+CRATE_util = $(S)src/components/util/util.rc
+DONE_util = $(B)src/components/util/libutil.dummy
 
-DEPS_servo_util = $(CRATE_servo_util) $(SRC_servo_util) $(DONE_SUBMODULES)
+DEPS_util = $(CRATE_util) $(SRC_util) $(DONE_SUBMODULES)
 
-RFLAGS_servo_net = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/servo-util
-SRC_servo_net = $(call rwildcard,$(S)src/components/servo-net/,*.rs)
-CRATE_servo_net = $(S)src/components/servo-net/servo_net.rc
-DONE_servo_net = $(B)src/components/servo-net/libservonet.dummy
+RFLAGS_net = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util
+SRC_net = $(call rwildcard,$(S)src/components/net/,*.rs)
+CRATE_net = $(S)src/components/net/net.rc
+DONE_net = $(B)src/components/net/libnet.dummy
 
-DEPS_servo_net = $(CRATE_servo_net) $(SRC_servo_net) $(DONE_SUBMODULES) $(DONE_servo_util)
+DEPS_net = $(CRATE_net) $(SRC_net) $(DONE_SUBMODULES) $(DONE_util)
 
-RFLAGS_servo_gfx = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/servo-util -L $(B)src/components/servo-net
-SRC_servo_gfx = $(call rwildcard,$(S)src/components/servo-gfx/,*.rs)
-CRATE_servo_gfx = $(S)src/components/servo-gfx/servo_gfx.rc
-DONE_servo_gfx = $(B)src/components/servo-gfx/libservogfx.dummy
+RFLAGS_gfx = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util -L $(B)src/components/net
+SRC_gfx = $(call rwildcard,$(S)src/components/gfx/,*.rs)
+CRATE_gfx = $(S)src/components/gfx/gfx.rc
+DONE_gfx = $(B)src/components/gfx/libgfx.dummy
 
-DEPS_servo_gfx = $(CRATE_servo_gfx) $(SRC_servo_gfx) $(DONE_SUBMODULES) $(DONE_servo_util) $(DONE_servo_net)
+DEPS_gfx = $(CRATE_gfx) $(SRC_gfx) $(DONE_SUBMODULES) $(DONE_util) $(DONE_net)
 
-RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/servo-gfx -L $(B)src/components/servo-util -L $(B)src/components/servo-net
+RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/gfx -L $(B)src/components/util -L $(B)src/components/net
 
-WEBIDL_servo = $(call rwildcard,$(S)src/components/servo/,*.webidl)
+WEBIDL_servo = $(call rwildcard,$(S)src/components/main/,*.webidl)
 AUTOGEN_SRC_servo = $(patsubst %.webidl, %Binding.rs, $(WEBIDL_servo))
-SRC_servo = $(call rwildcard,$(S)src/components/servo/,*.rs) $(AUTOGEN_SRC_servo)
-CRATE_servo = $(S)src/components/servo/servo.rc
+SRC_servo = $(call rwildcard,$(S)src/components/main/,*.rs) $(AUTOGEN_SRC_servo)
+CRATE_servo = $(S)src/components/main/servo.rc
 
-DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(DONE_servo_util) $(DONE_servo_gfx) $(DONE_servo_net)
+DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(DONE_util) $(DONE_gfx) $(DONE_net)
 
 # rules that depend on having correct meta-target vars (DEPS_CLEAN, DEPS_servo, etc)
 include $(S)mk/check.mk
@@ -211,16 +211,16 @@ all:    servo package
 
 # Servo helper libraries
 
-$(DONE_servo_util):	$(DEPS_servo_util)
-	$(RUSTC) $(RFLAGS_servo_util) -o $@ $< && touch $@
+$(DONE_util):	$(DEPS_util)
+	$(RUSTC) $(RFLAGS_util) -o $@ $< && touch $@
 
-$(DONE_servo_net):	$(DEPS_servo_net)
-	$(RUSTC) $(RFLAGS_servo_net) -o $@ $< && touch $@
+$(DONE_net):	$(DEPS_net)
+	$(RUSTC) $(RFLAGS_net) -o $@ $< && touch $@
 
-$(DONE_servo_gfx):	$(DEPS_servo_gfx)
-	$(RUSTC) $(RFLAGS_servo_gfx) -o $@ $< && touch $@
+$(DONE_gfx):	$(DEPS_gfx)
+	$(RUSTC) $(RFLAGS_gfx) -o $@ $< && touch $@
 
-BINDINGS_SRC = $(S)/src/components/servo/dom/bindings/codegen
+BINDINGS_SRC = $(S)/src/components/main/dom/bindings/codegen
 
 CACHE_DIR = $(BINDINGS_SRC)/_cache
 
diff --git a/README.md b/README.md
index 964c503e747..19d4d7f6460 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# The Servo Parallel Browser Project
+zRThe Servo Parallel Browser Project
 
 Servo is a prototype web browser engine written in the [Rust](https://github.com/mozilla/rust)
 language. It is currently developed on 64bit OS X and 64bit Linux.
@@ -36,7 +36,7 @@ cd servo
 mkdir -p build && cd build
 ../configure
 make && make check
-./servo ../src/test/about-mozilla.html
+./servo ../src/test/html/about-mozilla.html
 ```
 
 [issue]: https://github.com/mxcl/homebrew/issues/5117
diff --git a/configure b/configure
index 133bccc6882..90ed808c412 100755
--- a/configure
+++ b/configure
@@ -449,9 +449,10 @@ do
     make_dir ${CFG_BUILD_DIR}src/${i}
 done
 
-make_dir ${CFG_BUILD_DIR}src/components/servo-util
-make_dir ${CFG_BUILD_DIR}src/components/servo-net
-make_dir ${CFG_BUILD_DIR}src/components/servo-gfx
+make_dir ${CFG_BUILD_DIR}src/components/util
+make_dir ${CFG_BUILD_DIR}src/components/net
+make_dir ${CFG_BUILD_DIR}src/components/gfx
+make_dir ${CFG_BUILD_DIR}src/components/main
 make_dir src/test/html/ref
 make_dir src/compiler/rust
 
diff --git a/mk/clean.mk b/mk/clean.mk
index f0de6be741d..ca7ec8a0a9c 100644
--- a/mk/clean.mk
+++ b/mk/clean.mk
@@ -25,14 +25,14 @@ clean-fast: $(DEPS_CLEAN_TARGETS_FAST) clean-servo
 	$(Q)echo "Cleaning targets:"
 	$(Q)echo "$(filter-out $(SLOW_BUILDS),$(DEPS_CLEAN_ALL))"
 
-clean-servo-util:
-	cd $(B)/src/components/servo-util/ && rm -rf libservo_util*.dylib $(DONE_servo_util)
+clean-util:
+	cd $(B)/src/components/util/ && rm -rf libservo_util*.dylib $(DONE_servo_util)
 
-clean-servo-net:
-	cd $(B)/src/components/servo-net/ && rm -rf libservo_net*.dylib $(DONE_servo_net)
+clean-net:
+	cd $(B)/src/components/net/ && rm -rf libservo_net*.dylib $(DONE_servo_net)
 
-clean-servo-gfx:
-	cd $(B)/src/components/servo-gfx/ && rm -rf libservo_gfx*.dylib $(DONE_servo_gfx)
+clean-gfx:
+	cd $(B)/src/components/gfx/ && rm -rf libservo_gfx*.dylib $(DONE_servo_gfx)
 
-clean-servo: clean-servo-gfx clean-servo-util clean-servo-net
+clean-servo: clean-gfx clean-util clean-net
 	rm -f servo servo-test
diff --git a/src/README.md b/src/README.md
index e9b58181e65..fbdf3de6b42 100644
--- a/src/README.md
+++ b/src/README.md
@@ -3,12 +3,10 @@ crate or library.
 
 ## Servo components
 
-* `components/contenttest`: JavaScript test runner.
-* `components/reftest`: Reference (layout) test runner.
-* `components/servo`: The top-level Servo crate. Contains compositing, DOM, layout, and script.
-* `components/servo-gfx`: Graphics rendering, fonts, and text shaping.
-* `components/servo-net`: Networking, caching, image decoding.
-* `components/servo-util`: Various utility functions used by other Servo components.
+* `components/gfx`: Graphics rendering, fonts, and text shaping.
+* `components/main`: The top-level Servo crate. Contains compositing, DOM, layout, and script.
+* `components/net`: Networking, caching, image decoding.
+* `components/util`: Various utility functions used by other Servo components.
 
 ## The Rust compiler
 
@@ -60,9 +58,14 @@ they are designed to be useful in other Rust projects.
 * `platform/macos/rust-core-text`: Bindings to Core Text.
 * `platform/macos/rust-io-surface`: Bindings to the `IOSurface` library.
 
+## Tests
+
+* `test/harness/contenttest`: JavaScript test runner.
+* `test/harness/reftest`: Reference (layout) test runner.
+* `test/html`: Test cases.
+
 ## Miscellaneous
 
 * `etc`: Various scripts and files that don't belong anywhere else.
 * `etc/patches`: Patches for upstream libraries.
-* `test`: Test cases.
 
diff --git a/src/components/servo-gfx/color.rs b/src/components/gfx/color.rs
index 274b30a3212..274b30a3212 100644
--- a/src/components/servo-gfx/color.rs
+++ b/src/components/gfx/color.rs
diff --git a/src/components/servo-gfx/compositor.rs b/src/components/gfx/compositor.rs
index 83f8bb597a0..83f8bb597a0 100644
--- a/src/components/servo-gfx/compositor.rs
+++ b/src/components/gfx/compositor.rs
diff --git a/src/components/servo-gfx/display_list.rs b/src/components/gfx/display_list.rs
index afda98af08e..afda98af08e 100644
--- a/src/components/servo-gfx/display_list.rs
+++ b/src/components/gfx/display_list.rs
diff --git a/src/components/servo-gfx/font.rs b/src/components/gfx/font.rs
index 6405c0f34cb..6405c0f34cb 100644
--- a/src/components/servo-gfx/font.rs
+++ b/src/components/gfx/font.rs
diff --git a/src/components/servo-gfx/font_context.rs b/src/components/gfx/font_context.rs
index 5a4a57b2d7e..5a4a57b2d7e 100644
--- a/src/components/servo-gfx/font_context.rs
+++ b/src/components/gfx/font_context.rs
diff --git a/src/components/servo-gfx/font_list.rs b/src/components/gfx/font_list.rs
index 876e6d14aa5..876e6d14aa5 100644
--- a/src/components/servo-gfx/font_list.rs
+++ b/src/components/gfx/font_list.rs
diff --git a/src/components/servo-gfx/freetype_impl/font_context.rs b/src/components/gfx/freetype_impl/font_context.rs
index 35d09e4900a..35d09e4900a 100644
--- a/src/components/servo-gfx/freetype_impl/font_context.rs
+++ b/src/components/gfx/freetype_impl/font_context.rs
diff --git a/src/components/servo-gfx/geometry.rs b/src/components/gfx/geometry.rs
index d3b1f019df9..d3b1f019df9 100644
--- a/src/components/servo-gfx/geometry.rs
+++ b/src/components/gfx/geometry.rs
diff --git a/src/components/servo-gfx/servo_gfx.rc b/src/components/gfx/gfx.rc
index f785e0fc877..eae2328152a 100644
--- a/src/components/servo-gfx/servo_gfx.rc
+++ b/src/components/gfx/gfx.rc
@@ -2,7 +2,7 @@
  * 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/. */
 
-#[link(name = "servo_gfx",
+#[link(name = "gfx",
        vers = "0.1",
        uuid = "0106bb54-6ea9-45bf-a39e-a738621f15e5",
        url = "http://servo.org/")];
@@ -13,8 +13,8 @@ extern mod geom;
 extern mod http_client;
 extern mod stb_image;
 extern mod std;
-extern mod servo_net;
-extern mod servo_util (name = "servo_util");
+extern mod servo_net (name = "net");
+extern mod servo_util (name = "util");
 
 // Eventually we would like the shaper to be pluggable, as many operating systems have their own
 // shapers. For now, however, this is a hard dependency.
diff --git a/src/components/servo-gfx/native.rs b/src/components/gfx/native.rs
index c54196536b1..c54196536b1 100644
--- a/src/components/servo-gfx/native.rs
+++ b/src/components/gfx/native.rs
diff --git a/src/components/servo-gfx/opts.rs b/src/components/gfx/opts.rs
index d9c6ff1446c..d9c6ff1446c 100644
--- a/src/components/servo-gfx/opts.rs
+++ b/src/components/gfx/opts.rs
diff --git a/src/components/servo-gfx/platform/linux/font.rs b/src/components/gfx/platform/linux/font.rs
index 1eddd68677b..1eddd68677b 100644
--- a/src/components/servo-gfx/platform/linux/font.rs
+++ b/src/components/gfx/platform/linux/font.rs
diff --git a/src/components/servo-gfx/platform/linux/font_context.rs b/src/components/gfx/platform/linux/font_context.rs
index 4797dddba1a..4797dddba1a 100644
--- a/src/components/servo-gfx/platform/linux/font_context.rs
+++ b/src/components/gfx/platform/linux/font_context.rs
diff --git a/src/components/servo-gfx/platform/linux/font_list.rs b/src/components/gfx/platform/linux/font_list.rs
index a7b99c6679e..a7b99c6679e 100644
--- a/src/components/servo-gfx/platform/linux/font_list.rs
+++ b/src/components/gfx/platform/linux/font_list.rs
diff --git a/src/components/servo-gfx/platform/macos/font.rs b/src/components/gfx/platform/macos/font.rs
index dbdbc2a0324..dbdbc2a0324 100644
--- a/src/components/servo-gfx/platform/macos/font.rs
+++ b/src/components/gfx/platform/macos/font.rs
diff --git a/src/components/servo-gfx/platform/macos/font_context.rs b/src/components/gfx/platform/macos/font_context.rs
index 1d780cae5cf..1d780cae5cf 100644
--- a/src/components/servo-gfx/platform/macos/font_context.rs
+++ b/src/components/gfx/platform/macos/font_context.rs
diff --git a/src/components/servo-gfx/platform/macos/font_list.rs b/src/components/gfx/platform/macos/font_list.rs
index f362b513092..f362b513092 100644
--- a/src/components/servo-gfx/platform/macos/font_list.rs
+++ b/src/components/gfx/platform/macos/font_list.rs
diff --git a/src/components/servo-gfx/platform/mod.rs b/src/components/gfx/platform/mod.rs
index 2d8fb4f9ce7..2d8fb4f9ce7 100644
--- a/src/components/servo-gfx/platform/mod.rs
+++ b/src/components/gfx/platform/mod.rs
diff --git a/src/components/servo-gfx/render_context.rs b/src/components/gfx/render_context.rs
index 17fb40d825c..17fb40d825c 100644
--- a/src/components/servo-gfx/render_context.rs
+++ b/src/components/gfx/render_context.rs
diff --git a/src/components/servo-gfx/render_layers.rs b/src/components/gfx/render_layers.rs
index 49ee76130a5..49ee76130a5 100644
--- a/src/components/servo-gfx/render_layers.rs
+++ b/src/components/gfx/render_layers.rs
diff --git a/src/components/servo-gfx/render_task.rs b/src/components/gfx/render_task.rs
index 231738b3a14..231738b3a14 100644
--- a/src/components/servo-gfx/render_task.rs
+++ b/src/components/gfx/render_task.rs
diff --git a/src/components/servo-gfx/surface.rs b/src/components/gfx/surface.rs
index f1d4e95e658..f1d4e95e658 100644
--- a/src/components/servo-gfx/surface.rs
+++ b/src/components/gfx/surface.rs
diff --git a/src/components/servo-gfx/text/glyph.rs b/src/components/gfx/text/glyph.rs
index 7a1dfea9467..7a1dfea9467 100644
--- a/src/components/servo-gfx/text/glyph.rs
+++ b/src/components/gfx/text/glyph.rs
diff --git a/src/components/servo-gfx/text/mod.rs b/src/components/gfx/text/mod.rs
index edadaae760d..edadaae760d 100644
--- a/src/components/servo-gfx/text/mod.rs
+++ b/src/components/gfx/text/mod.rs
diff --git a/src/components/servo-gfx/text/shaper.rs b/src/components/gfx/text/shaper.rs
index 217d2496a9e..217d2496a9e 100644
--- a/src/components/servo-gfx/text/shaper.rs
+++ b/src/components/gfx/text/shaper.rs
diff --git a/src/components/servo-gfx/text/shaping/harfbuzz.rs b/src/components/gfx/text/shaping/harfbuzz.rs
index f7cbceb459e..f7cbceb459e 100644
--- a/src/components/servo-gfx/text/shaping/harfbuzz.rs
+++ b/src/components/gfx/text/shaping/harfbuzz.rs
diff --git a/src/components/servo-gfx/text/shaping/mod.rs b/src/components/gfx/text/shaping/mod.rs
index db326727127..db326727127 100644
--- a/src/components/servo-gfx/text/shaping/mod.rs
+++ b/src/components/gfx/text/shaping/mod.rs
diff --git a/src/components/servo-gfx/text/text_run.rs b/src/components/gfx/text/text_run.rs
index 3778e4353db..3778e4353db 100644
--- a/src/components/servo-gfx/text/text_run.rs
+++ b/src/components/gfx/text/text_run.rs
diff --git a/src/components/servo-gfx/text/util.rs b/src/components/gfx/text/util.rs
index 1ce4d4b4ff8..1ce4d4b4ff8 100644
--- a/src/components/servo-gfx/text/util.rs
+++ b/src/components/gfx/text/util.rs
diff --git a/src/components/servo/compositing/mod.rs b/src/components/main/compositing/mod.rs
index 59529714f5f..59529714f5f 100644
--- a/src/components/servo/compositing/mod.rs
+++ b/src/components/main/compositing/mod.rs
diff --git a/src/components/servo/compositing/resize_rate_limiter.rs b/src/components/main/compositing/resize_rate_limiter.rs
index efbf4e0ff53..efbf4e0ff53 100644
--- a/src/components/servo/compositing/resize_rate_limiter.rs
+++ b/src/components/main/compositing/resize_rate_limiter.rs
diff --git a/src/components/servo/css/matching.rs b/src/components/main/css/matching.rs
index 3a95aceac07..3a95aceac07 100644
--- a/src/components/servo/css/matching.rs
+++ b/src/components/main/css/matching.rs
diff --git a/src/components/servo/css/node_style.rs b/src/components/main/css/node_style.rs
index c6b72a7cb70..c6b72a7cb70 100644
--- a/src/components/servo/css/node_style.rs
+++ b/src/components/main/css/node_style.rs
diff --git a/src/components/servo/css/node_util.rs b/src/components/main/css/node_util.rs
index 0dc15dc6518..0dc15dc6518 100644
--- a/src/components/servo/css/node_util.rs
+++ b/src/components/main/css/node_util.rs
diff --git a/src/components/servo/css/node_void_ptr.rs b/src/components/main/css/node_void_ptr.rs
index 3c25e0091c5..3c25e0091c5 100644
--- a/src/components/servo/css/node_void_ptr.rs
+++ b/src/components/main/css/node_void_ptr.rs
diff --git a/src/components/servo/css/select.rs b/src/components/main/css/select.rs
index 71f5327cedb..71f5327cedb 100644
--- a/src/components/servo/css/select.rs
+++ b/src/components/main/css/select.rs
diff --git a/src/components/servo/css/select_handler.rs b/src/components/main/css/select_handler.rs
index 7dec3aae654..7dec3aae654 100644
--- a/src/components/servo/css/select_handler.rs
+++ b/src/components/main/css/select_handler.rs
diff --git a/src/components/servo/dom/bindings/clientrect.rs b/src/components/main/dom/bindings/clientrect.rs
index ca7317de083..ca7317de083 100644
--- a/src/components/servo/dom/bindings/clientrect.rs
+++ b/src/components/main/dom/bindings/clientrect.rs
diff --git a/src/components/servo/dom/bindings/clientrectlist.rs b/src/components/main/dom/bindings/clientrectlist.rs
index 783dc78267d..783dc78267d 100644
--- a/src/components/servo/dom/bindings/clientrectlist.rs
+++ b/src/components/main/dom/bindings/clientrectlist.rs
diff --git a/src/components/servo/dom/bindings/codegen/BindingGen.py b/src/components/main/dom/bindings/codegen/BindingGen.py
index e292427e33b..e292427e33b 100644
--- a/src/components/servo/dom/bindings/codegen/BindingGen.py
+++ b/src/components/main/dom/bindings/codegen/BindingGen.py
diff --git a/src/components/servo/dom/bindings/codegen/BindingUtils.cpp b/src/components/main/dom/bindings/codegen/BindingUtils.cpp
index 27ac92e3596..27ac92e3596 100644
--- a/src/components/servo/dom/bindings/codegen/BindingUtils.cpp
+++ b/src/components/main/dom/bindings/codegen/BindingUtils.cpp
diff --git a/src/components/servo/dom/bindings/codegen/BindingUtils.h b/src/components/main/dom/bindings/codegen/BindingUtils.h
index ee9d6c3691c..ee9d6c3691c 100644
--- a/src/components/servo/dom/bindings/codegen/BindingUtils.h
+++ b/src/components/main/dom/bindings/codegen/BindingUtils.h
diff --git a/src/components/servo/dom/bindings/codegen/Bindings.conf b/src/components/main/dom/bindings/codegen/Bindings.conf
index 442bd0b432c..442bd0b432c 100644
--- a/src/components/servo/dom/bindings/codegen/Bindings.conf
+++ b/src/components/main/dom/bindings/codegen/Bindings.conf
diff --git a/src/components/servo/dom/bindings/codegen/ClientRect.webidl b/src/components/main/dom/bindings/codegen/ClientRect.webidl
index dcec655aca7..dcec655aca7 100644
--- a/src/components/servo/dom/bindings/codegen/ClientRect.webidl
+++ b/src/components/main/dom/bindings/codegen/ClientRect.webidl
diff --git a/src/components/servo/dom/bindings/codegen/ClientRectList.webidl b/src/components/main/dom/bindings/codegen/ClientRectList.webidl
index 964425bd0f8..964425bd0f8 100644
--- a/src/components/servo/dom/bindings/codegen/ClientRectList.webidl
+++ b/src/components/main/dom/bindings/codegen/ClientRectList.webidl
diff --git a/src/components/servo/dom/bindings/codegen/Codegen.py b/src/components/main/dom/bindings/codegen/Codegen.py
index 6d2cc0bde36..6d2cc0bde36 100644
--- a/src/components/servo/dom/bindings/codegen/Codegen.py
+++ b/src/components/main/dom/bindings/codegen/Codegen.py
diff --git a/src/components/servo/dom/bindings/codegen/CodegenRust.py b/src/components/main/dom/bindings/codegen/CodegenRust.py
index 0fc99027ab1..0fc99027ab1 100644
--- a/src/components/servo/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/main/dom/bindings/codegen/CodegenRust.py
diff --git a/src/components/servo/dom/bindings/codegen/Configuration.py b/src/components/main/dom/bindings/codegen/Configuration.py
index 46e16fdc37c..46e16fdc37c 100644
--- a/src/components/servo/dom/bindings/codegen/Configuration.py
+++ b/src/components/main/dom/bindings/codegen/Configuration.py
diff --git a/src/components/servo/dom/bindings/codegen/DOMJSClass.h b/src/components/main/dom/bindings/codegen/DOMJSClass.h
index 151960b5901..151960b5901 100644
--- a/src/components/servo/dom/bindings/codegen/DOMJSClass.h
+++ b/src/components/main/dom/bindings/codegen/DOMJSClass.h
diff --git a/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp b/src/components/main/dom/bindings/codegen/DOMJSProxyHandler.cpp
index af45cc6ed1a..af45cc6ed1a 100644
--- a/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp
+++ b/src/components/main/dom/bindings/codegen/DOMJSProxyHandler.cpp
diff --git a/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.h b/src/components/main/dom/bindings/codegen/DOMJSProxyHandler.h
index 394e2dc4d2f..394e2dc4d2f 100644
--- a/src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.h
+++ b/src/components/main/dom/bindings/codegen/DOMJSProxyHandler.h
diff --git a/src/components/servo/dom/bindings/codegen/DOMParser.webidl b/src/components/main/dom/bindings/codegen/DOMParser.webidl
index 435cd8dda92..435cd8dda92 100644
--- a/src/components/servo/dom/bindings/codegen/DOMParser.webidl
+++ b/src/components/main/dom/bindings/codegen/DOMParser.webidl
diff --git a/src/components/servo/dom/bindings/codegen/ErrorResult.h b/src/components/main/dom/bindings/codegen/ErrorResult.h
index bbd9404a865..bbd9404a865 100644
--- a/src/components/servo/dom/bindings/codegen/ErrorResult.h
+++ b/src/components/main/dom/bindings/codegen/ErrorResult.h
diff --git a/src/components/servo/dom/bindings/codegen/Errors.msg b/src/components/main/dom/bindings/codegen/Errors.msg
index 81d6624cec8..81d6624cec8 100644
--- a/src/components/servo/dom/bindings/codegen/Errors.msg
+++ b/src/components/main/dom/bindings/codegen/Errors.msg
diff --git a/src/components/servo/dom/bindings/codegen/Event.webidl b/src/components/main/dom/bindings/codegen/Event.webidl
index 48af319ada0..48af319ada0 100644
--- a/src/components/servo/dom/bindings/codegen/Event.webidl
+++ b/src/components/main/dom/bindings/codegen/Event.webidl
diff --git a/src/components/servo/dom/bindings/codegen/EventTarget.webidl b/src/components/main/dom/bindings/codegen/EventTarget.webidl
index f4e1ba00f70..f4e1ba00f70 100644
--- a/src/components/servo/dom/bindings/codegen/EventTarget.webidl
+++ b/src/components/main/dom/bindings/codegen/EventTarget.webidl
diff --git a/src/components/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py b/src/components/main/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
index 1bb50afaee7..1bb50afaee7 100644
--- a/src/components/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
+++ b/src/components/main/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
diff --git a/src/components/servo/dom/bindings/codegen/GlobalGen.py b/src/components/main/dom/bindings/codegen/GlobalGen.py
index dbfc4f86e14..dbfc4f86e14 100644
--- a/src/components/servo/dom/bindings/codegen/GlobalGen.py
+++ b/src/components/main/dom/bindings/codegen/GlobalGen.py
diff --git a/src/components/servo/dom/bindings/codegen/HTMLCollection.webidl b/src/components/main/dom/bindings/codegen/HTMLCollection.webidl
index 5797f85e392..5797f85e392 100644
--- a/src/components/servo/dom/bindings/codegen/HTMLCollection.webidl
+++ b/src/components/main/dom/bindings/codegen/HTMLCollection.webidl
diff --git a/src/components/servo/dom/bindings/codegen/Makefile.in b/src/components/main/dom/bindings/codegen/Makefile.in
index 69fe4be4e9b..69fe4be4e9b 100644
--- a/src/components/servo/dom/bindings/codegen/Makefile.in
+++ b/src/components/main/dom/bindings/codegen/Makefile.in
diff --git a/src/components/servo/dom/bindings/codegen/Nullable.h b/src/components/main/dom/bindings/codegen/Nullable.h
index 8b2cc08642b..8b2cc08642b 100644
--- a/src/components/servo/dom/bindings/codegen/Nullable.h
+++ b/src/components/main/dom/bindings/codegen/Nullable.h
diff --git a/src/components/servo/dom/bindings/codegen/PrimitiveConversions.h b/src/components/main/dom/bindings/codegen/PrimitiveConversions.h
index 40c27425772..40c27425772 100644
--- a/src/components/servo/dom/bindings/codegen/PrimitiveConversions.h
+++ b/src/components/main/dom/bindings/codegen/PrimitiveConversions.h
diff --git a/src/components/servo/dom/bindings/codegen/RegisterBindings.cpp b/src/components/main/dom/bindings/codegen/RegisterBindings.cpp
index 74244842a21..74244842a21 100644
--- a/src/components/servo/dom/bindings/codegen/RegisterBindings.cpp
+++ b/src/components/main/dom/bindings/codegen/RegisterBindings.cpp
diff --git a/src/components/servo/dom/bindings/codegen/RegisterBindings.h b/src/components/main/dom/bindings/codegen/RegisterBindings.h
index 7d83a747cc3..7d83a747cc3 100644
--- a/src/components/servo/dom/bindings/codegen/RegisterBindings.h
+++ b/src/components/main/dom/bindings/codegen/RegisterBindings.h
diff --git a/src/components/servo/dom/bindings/codegen/TypedArray.h b/src/components/main/dom/bindings/codegen/TypedArray.h
index 2a6f17bcb96..2a6f17bcb96 100644
--- a/src/components/servo/dom/bindings/codegen/TypedArray.h
+++ b/src/components/main/dom/bindings/codegen/TypedArray.h
diff --git a/src/components/servo/dom/bindings/codegen/crashtests/769464.html b/src/components/main/dom/bindings/codegen/crashtests/769464.html
index 84d6dbc08b4..84d6dbc08b4 100644
--- a/src/components/servo/dom/bindings/codegen/crashtests/769464.html
+++ b/src/components/main/dom/bindings/codegen/crashtests/769464.html
diff --git a/src/components/servo/dom/bindings/codegen/crashtests/crashtests.list b/src/components/main/dom/bindings/codegen/crashtests/crashtests.list
index cb954bd91fc..cb954bd91fc 100644
--- a/src/components/servo/dom/bindings/codegen/crashtests/crashtests.list
+++ b/src/components/main/dom/bindings/codegen/crashtests/crashtests.list
diff --git a/src/components/servo/dom/bindings/codegen/parser/README b/src/components/main/dom/bindings/codegen/parser/README
index 94b64b88459..94b64b88459 100644
--- a/src/components/servo/dom/bindings/codegen/parser/README
+++ b/src/components/main/dom/bindings/codegen/parser/README
diff --git a/src/components/servo/dom/bindings/codegen/parser/UPSTREAM b/src/components/main/dom/bindings/codegen/parser/UPSTREAM
index 7ac5899379e..7ac5899379e 100644
--- a/src/components/servo/dom/bindings/codegen/parser/UPSTREAM
+++ b/src/components/main/dom/bindings/codegen/parser/UPSTREAM
diff --git a/src/components/servo/dom/bindings/codegen/parser/WebIDL.py b/src/components/main/dom/bindings/codegen/parser/WebIDL.py
index 98273a419e6..98273a419e6 100644
--- a/src/components/servo/dom/bindings/codegen/parser/WebIDL.py
+++ b/src/components/main/dom/bindings/codegen/parser/WebIDL.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/runtests.py b/src/components/main/dom/bindings/codegen/parser/runtests.py
index 98a7d2b81d3..98a7d2b81d3 100644
--- a/src/components/servo/dom/bindings/codegen/parser/runtests.py
+++ b/src/components/main/dom/bindings/codegen/parser/runtests.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_any_null.py b/src/components/main/dom/bindings/codegen/parser/tests/test_any_null.py
index e3b690bf6f1..e3b690bf6f1 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_any_null.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_any_null.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py b/src/components/main/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py
index eb1f6d3c92e..eb1f6d3c92e 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py b/src/components/main/dom/bindings/codegen/parser/tests/test_argument_novoid.py
index ef8c2229aed..ef8c2229aed 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_argument_novoid.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py b/src/components/main/dom/bindings/codegen/parser/tests/test_array_of_interface.py
index 26528984595..26528984595 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_array_of_interface.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py b/src/components/main/dom/bindings/codegen/parser/tests/test_arraybuffer.py
index 5b8e56f86ca..5b8e56f86ca 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_arraybuffer.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_attr.py b/src/components/main/dom/bindings/codegen/parser/tests/test_attr.py
index 6b6142b6243..6b6142b6243 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_attr.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_attr.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py b/src/components/main/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py
index fb1b97812bc..fb1b97812bc 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py b/src/components/main/dom/bindings/codegen/parser/tests/test_builtin_filename.py
index 631e52eba0b..631e52eba0b 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_builtin_filename.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_builtins.py b/src/components/main/dom/bindings/codegen/parser/tests/test_builtins.py
index f8563fc2d9b..f8563fc2d9b 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_builtins.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_builtins.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_callback.py b/src/components/main/dom/bindings/codegen/parser/tests/test_callback.py
index 267d27dc087..267d27dc087 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_callback.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_callback.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py b/src/components/main/dom/bindings/codegen/parser/tests/test_callback_interface.py
index 80896ca1edb..80896ca1edb 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_callback_interface.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_const.py b/src/components/main/dom/bindings/codegen/parser/tests/test_const.py
index 12f411363fb..12f411363fb 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_const.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_const.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor.py b/src/components/main/dom/bindings/codegen/parser/tests/test_constructor.py
index 6ec1be1871b..6ec1be1871b 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_constructor.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py b/src/components/main/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py
index 192c5f6f97b..192c5f6f97b 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py b/src/components/main/dom/bindings/codegen/parser/tests/test_deduplicate.py
index 6249d36fb8f..6249d36fb8f 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_deduplicate.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_dictionary.py b/src/components/main/dom/bindings/codegen/parser/tests/test_dictionary.py
index 9ae9eb2b66f..9ae9eb2b66f 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_dictionary.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_dictionary.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py b/src/components/main/dom/bindings/codegen/parser/tests/test_distinguishability.py
index 86847800631..86847800631 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_distinguishability.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_double_null.py b/src/components/main/dom/bindings/codegen/parser/tests/test_double_null.py
index 700c7eade00..700c7eade00 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_double_null.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_double_null.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py b/src/components/main/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py
index 799f2e0e0ed..799f2e0e0ed 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py b/src/components/main/dom/bindings/codegen/parser/tests/test_empty_enum.py
index ee0079f06da..ee0079f06da 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_empty_enum.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_enum.py b/src/components/main/dom/bindings/codegen/parser/tests/test_enum.py
index 69a6932062d..69a6932062d 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_enum.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_enum.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py b/src/components/main/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py
index 51205d209e7..51205d209e7 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_error_colno.py b/src/components/main/dom/bindings/codegen/parser/tests/test_error_colno.py
index ca0674aec04..ca0674aec04 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_error_colno.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_error_colno.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py b/src/components/main/dom/bindings/codegen/parser/tests/test_error_lineno.py
index f11222e7a4d..f11222e7a4d 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_error_lineno.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py b/src/components/main/dom/bindings/codegen/parser/tests/test_extended_attributes.py
index 5c6887331e7..5c6887331e7 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_extended_attributes.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py b/src/components/main/dom/bindings/codegen/parser/tests/test_forward_decl.py
index cac24c832cc..cac24c832cc 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_forward_decl.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_implements.py b/src/components/main/dom/bindings/codegen/parser/tests/test_implements.py
index 04c47d92abe..04c47d92abe 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_implements.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_implements.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py b/src/components/main/dom/bindings/codegen/parser/tests/test_incomplete_parent.py
index 1f520a28e16..1f520a28e16 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_incomplete_parent.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py b/src/components/main/dom/bindings/codegen/parser/tests/test_incomplete_types.py
index fdc39604070..fdc39604070 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_incomplete_types.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_interface.py b/src/components/main/dom/bindings/codegen/parser/tests/test_interface.py
index 5b07172c636..5b07172c636 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_interface.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_interface.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py b/src/components/main/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py
index db944e7aaf7..db944e7aaf7 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py b/src/components/main/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py
index 1a73fb917ed..1a73fb917ed 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_method.py b/src/components/main/dom/bindings/codegen/parser/tests/test_method.py
index 40b2d2cf8b9..40b2d2cf8b9 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_method.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_method.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py b/src/components/main/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py
index 3366b9fbbbd..3366b9fbbbd 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py b/src/components/main/dom/bindings/codegen/parser/tests/test_nullable_void.py
index 961ff825e9f..961ff825e9f 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_nullable_void.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py b/src/components/main/dom/bindings/codegen/parser/tests/test_optional_constraints.py
index 1dcdc7fb8a5..1dcdc7fb8a5 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_optional_constraints.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_overload.py b/src/components/main/dom/bindings/codegen/parser/tests/test_overload.py
index 59d9be54e53..59d9be54e53 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_overload.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_overload.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_sanity.py b/src/components/main/dom/bindings/codegen/parser/tests/test_sanity.py
index d3184c00731..d3184c00731 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_sanity.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_sanity.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py b/src/components/main/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py
index 5ea1743d36a..5ea1743d36a 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods.py b/src/components/main/dom/bindings/codegen/parser/tests/test_special_methods.py
index 695cfe4f250..695cfe4f250 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_special_methods.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py b/src/components/main/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py
index 42e2c5bb71b..42e2c5bb71b 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py b/src/components/main/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py
index 3d0e5ca479f..3d0e5ca479f 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_typedef.py b/src/components/main/dom/bindings/codegen/parser/tests/test_typedef.py
index 9d2f3b3c2ce..9d2f3b3c2ce 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_typedef.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_typedef.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_union.py b/src/components/main/dom/bindings/codegen/parser/tests/test_union.py
index 68c2bcade8c..68c2bcade8c 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_union.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_union.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_union_any.py b/src/components/main/dom/bindings/codegen/parser/tests/test_union_any.py
index e34cadab470..e34cadab470 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_union_any.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_union_any.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py b/src/components/main/dom/bindings/codegen/parser/tests/test_union_nullable.py
index 08430a94a2e..08430a94a2e 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_union_nullable.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py b/src/components/main/dom/bindings/codegen/parser/tests/test_variadic_callback.py
index d9a78db2043..d9a78db2043 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_variadic_callback.py
diff --git a/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py b/src/components/main/dom/bindings/codegen/parser/tests/test_variadic_constraints.py
index 9cba22c5842..9cba22c5842 100644
--- a/src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py
+++ b/src/components/main/dom/bindings/codegen/parser/tests/test_variadic_constraints.py
diff --git a/src/components/servo/dom/bindings/codegen/ply/COPYING b/src/components/main/dom/bindings/codegen/ply/COPYING
index 3b107de4508..3b107de4508 100644
--- a/src/components/servo/dom/bindings/codegen/ply/COPYING
+++ b/src/components/main/dom/bindings/codegen/ply/COPYING
diff --git a/src/components/servo/dom/bindings/codegen/ply/README b/src/components/main/dom/bindings/codegen/ply/README
index 2459c490197..2459c490197 100644
--- a/src/components/servo/dom/bindings/codegen/ply/README
+++ b/src/components/main/dom/bindings/codegen/ply/README
diff --git a/src/components/servo/dom/bindings/codegen/ply/ply/__init__.py b/src/components/main/dom/bindings/codegen/ply/ply/__init__.py
index 853a985542b..853a985542b 100644
--- a/src/components/servo/dom/bindings/codegen/ply/ply/__init__.py
+++ b/src/components/main/dom/bindings/codegen/ply/ply/__init__.py
diff --git a/src/components/servo/dom/bindings/codegen/ply/ply/lex.py b/src/components/main/dom/bindings/codegen/ply/ply/lex.py
index 267ec100fc2..267ec100fc2 100644
--- a/src/components/servo/dom/bindings/codegen/ply/ply/lex.py
+++ b/src/components/main/dom/bindings/codegen/ply/ply/lex.py
diff --git a/src/components/servo/dom/bindings/codegen/ply/ply/yacc.py b/src/components/main/dom/bindings/codegen/ply/ply/yacc.py
index e9f5c657551..e9f5c657551 100644
--- a/src/components/servo/dom/bindings/codegen/ply/ply/yacc.py
+++ b/src/components/main/dom/bindings/codegen/ply/ply/yacc.py
diff --git a/src/components/servo/dom/bindings/codegen/pythonpath.py b/src/components/main/dom/bindings/codegen/pythonpath.py
index 49b2d2f740f..49b2d2f740f 100644
--- a/src/components/servo/dom/bindings/codegen/pythonpath.py
+++ b/src/components/main/dom/bindings/codegen/pythonpath.py
diff --git a/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp b/src/components/main/dom/bindings/codegen/stubgenerator/Skeleton.cpp
index dfa17d23400..dfa17d23400 100644
--- a/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp
+++ b/src/components/main/dom/bindings/codegen/stubgenerator/Skeleton.cpp
diff --git a/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.h b/src/components/main/dom/bindings/codegen/stubgenerator/Skeleton.h
index 286cff9af4a..286cff9af4a 100644
--- a/src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.h
+++ b/src/components/main/dom/bindings/codegen/stubgenerator/Skeleton.h
diff --git a/src/components/servo/dom/bindings/codegen/stubgenerator/generate.sh b/src/components/main/dom/bindings/codegen/stubgenerator/generate.sh
index 52577f6f42f..52577f6f42f 100644
--- a/src/components/servo/dom/bindings/codegen/stubgenerator/generate.sh
+++ b/src/components/main/dom/bindings/codegen/stubgenerator/generate.sh
diff --git a/src/components/servo/dom/bindings/codegen/test/Makefile.in b/src/components/main/dom/bindings/codegen/test/Makefile.in
index de388187c87..de388187c87 100644
--- a/src/components/servo/dom/bindings/codegen/test/Makefile.in
+++ b/src/components/main/dom/bindings/codegen/test/Makefile.in
diff --git a/src/components/servo/dom/bindings/codegen/test/TestBindingHeader.h b/src/components/main/dom/bindings/codegen/test/TestBindingHeader.h
index 1fbab0a9fb8..1fbab0a9fb8 100644
--- a/src/components/servo/dom/bindings/codegen/test/TestBindingHeader.h
+++ b/src/components/main/dom/bindings/codegen/test/TestBindingHeader.h
diff --git a/src/components/servo/dom/bindings/codegen/test/TestCodeGen.webidl b/src/components/main/dom/bindings/codegen/test/TestCodeGen.webidl
index 8c2b3c1b6b4..8c2b3c1b6b4 100644
--- a/src/components/servo/dom/bindings/codegen/test/TestCodeGen.webidl
+++ b/src/components/main/dom/bindings/codegen/test/TestCodeGen.webidl
diff --git a/src/components/servo/dom/bindings/codegen/test/TestDictionary.webidl b/src/components/main/dom/bindings/codegen/test/TestDictionary.webidl
index 3dd91bd6500..3dd91bd6500 100644
--- a/src/components/servo/dom/bindings/codegen/test/TestDictionary.webidl
+++ b/src/components/main/dom/bindings/codegen/test/TestDictionary.webidl
diff --git a/src/components/servo/dom/bindings/codegen/test/TestTypedef.webidl b/src/components/main/dom/bindings/codegen/test/TestTypedef.webidl
index 7f758c79e8f..7f758c79e8f 100644
--- a/src/components/servo/dom/bindings/codegen/test/TestTypedef.webidl
+++ b/src/components/main/dom/bindings/codegen/test/TestTypedef.webidl
diff --git a/src/components/servo/dom/bindings/codegen/test/file_bug775543.html b/src/components/main/dom/bindings/codegen/test/file_bug775543.html
index ee8c14c4d9c..ee8c14c4d9c 100644
--- a/src/components/servo/dom/bindings/codegen/test/file_bug775543.html
+++ b/src/components/main/dom/bindings/codegen/test/file_bug775543.html
diff --git a/src/components/servo/dom/bindings/codegen/test/forOf_iframe.html b/src/components/main/dom/bindings/codegen/test/forOf_iframe.html
index 91417aba0e8..91417aba0e8 100644
--- a/src/components/servo/dom/bindings/codegen/test/forOf_iframe.html
+++ b/src/components/main/dom/bindings/codegen/test/forOf_iframe.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_InstanceOf.html b/src/components/main/dom/bindings/codegen/test/test_InstanceOf.html
index 3a5a76b1b21..3a5a76b1b21 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_InstanceOf.html
+++ b/src/components/main/dom/bindings/codegen/test/test_InstanceOf.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_bug773326.html b/src/components/main/dom/bindings/codegen/test/test_bug773326.html
index 2e3b1ea304d..2e3b1ea304d 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_bug773326.html
+++ b/src/components/main/dom/bindings/codegen/test/test_bug773326.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_bug775543.html b/src/components/main/dom/bindings/codegen/test/test_bug775543.html
index d8df05f630f..d8df05f630f 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_bug775543.html
+++ b/src/components/main/dom/bindings/codegen/test/test_bug775543.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_bug788369.html b/src/components/main/dom/bindings/codegen/test/test_bug788369.html
index 787bd28fe34..787bd28fe34 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_bug788369.html
+++ b/src/components/main/dom/bindings/codegen/test/test_bug788369.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_enums.html b/src/components/main/dom/bindings/codegen/test/test_enums.html
index e5dc519a0c9..e5dc519a0c9 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_enums.html
+++ b/src/components/main/dom/bindings/codegen/test/test_enums.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_forOf.html b/src/components/main/dom/bindings/codegen/test/test_forOf.html
index b1a3032a385..b1a3032a385 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_forOf.html
+++ b/src/components/main/dom/bindings/codegen/test/test_forOf.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_integers.html b/src/components/main/dom/bindings/codegen/test/test_integers.html
index 6799fd791a8..6799fd791a8 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_integers.html
+++ b/src/components/main/dom/bindings/codegen/test/test_integers.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_interfaceToString.html b/src/components/main/dom/bindings/codegen/test/test_interfaceToString.html
index cf670bf2d54..cf670bf2d54 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_interfaceToString.html
+++ b/src/components/main/dom/bindings/codegen/test/test_interfaceToString.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_lookupGetter.html b/src/components/main/dom/bindings/codegen/test/test_lookupGetter.html
index 306ee4f643c..306ee4f643c 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_lookupGetter.html
+++ b/src/components/main/dom/bindings/codegen/test/test_lookupGetter.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_sequence_wrapping.html b/src/components/main/dom/bindings/codegen/test/test_sequence_wrapping.html
index e4f18f9986c..e4f18f9986c 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_sequence_wrapping.html
+++ b/src/components/main/dom/bindings/codegen/test/test_sequence_wrapping.html
diff --git a/src/components/servo/dom/bindings/codegen/test/test_traceProtos.html b/src/components/main/dom/bindings/codegen/test/test_traceProtos.html
index 195876744d6..195876744d6 100644
--- a/src/components/servo/dom/bindings/codegen/test/test_traceProtos.html
+++ b/src/components/main/dom/bindings/codegen/test/test_traceProtos.html
diff --git a/src/components/servo/dom/bindings/conversions.rs b/src/components/main/dom/bindings/conversions.rs
index 7350427a95e..7350427a95e 100644
--- a/src/components/servo/dom/bindings/conversions.rs
+++ b/src/components/main/dom/bindings/conversions.rs
diff --git a/src/components/servo/dom/bindings/document.rs b/src/components/main/dom/bindings/document.rs
index 36029e8d5b8..36029e8d5b8 100644
--- a/src/components/servo/dom/bindings/document.rs
+++ b/src/components/main/dom/bindings/document.rs
diff --git a/src/components/servo/dom/bindings/domparser.rs b/src/components/main/dom/bindings/domparser.rs
index 21744e43eb2..21744e43eb2 100644
--- a/src/components/servo/dom/bindings/domparser.rs
+++ b/src/components/main/dom/bindings/domparser.rs
diff --git a/src/components/servo/dom/bindings/element.rs b/src/components/main/dom/bindings/element.rs
index c6eb59107a8..c6eb59107a8 100644
--- a/src/components/servo/dom/bindings/element.rs
+++ b/src/components/main/dom/bindings/element.rs
diff --git a/src/components/servo/dom/bindings/event.rs b/src/components/main/dom/bindings/event.rs
index 1463ffe7ea4..1463ffe7ea4 100644
--- a/src/components/servo/dom/bindings/event.rs
+++ b/src/components/main/dom/bindings/event.rs
diff --git a/src/components/servo/dom/bindings/eventtarget.rs b/src/components/main/dom/bindings/eventtarget.rs
index 2b721f92d3e..2b721f92d3e 100644
--- a/src/components/servo/dom/bindings/eventtarget.rs
+++ b/src/components/main/dom/bindings/eventtarget.rs
diff --git a/src/components/servo/dom/bindings/htmlcollection.rs b/src/components/main/dom/bindings/htmlcollection.rs
index 11e3f75e0d0..11e3f75e0d0 100644
--- a/src/components/servo/dom/bindings/htmlcollection.rs
+++ b/src/components/main/dom/bindings/htmlcollection.rs
diff --git a/src/components/servo/dom/bindings/node.rs b/src/components/main/dom/bindings/node.rs
index 52bd80f382b..52bd80f382b 100644
--- a/src/components/servo/dom/bindings/node.rs
+++ b/src/components/main/dom/bindings/node.rs
diff --git a/src/components/servo/dom/bindings/proxyhandler.rs b/src/components/main/dom/bindings/proxyhandler.rs
index f073f54d8c1..f073f54d8c1 100644
--- a/src/components/servo/dom/bindings/proxyhandler.rs
+++ b/src/components/main/dom/bindings/proxyhandler.rs
diff --git a/src/components/servo/dom/bindings/text.rs b/src/components/main/dom/bindings/text.rs
index 41a4ece1c03..41a4ece1c03 100644
--- a/src/components/servo/dom/bindings/text.rs
+++ b/src/components/main/dom/bindings/text.rs
diff --git a/src/components/servo/dom/bindings/utils.rs b/src/components/main/dom/bindings/utils.rs
index a27207ef32d..a27207ef32d 100644
--- a/src/components/servo/dom/bindings/utils.rs
+++ b/src/components/main/dom/bindings/utils.rs
diff --git a/src/components/servo/dom/bindings/window.rs b/src/components/main/dom/bindings/window.rs
index 27d55ff1475..27d55ff1475 100644
--- a/src/components/servo/dom/bindings/window.rs
+++ b/src/components/main/dom/bindings/window.rs
diff --git a/src/components/servo/dom/characterdata.rs b/src/components/main/dom/characterdata.rs
index a8d81158d9c..a8d81158d9c 100644
--- a/src/components/servo/dom/characterdata.rs
+++ b/src/components/main/dom/characterdata.rs
diff --git a/src/components/servo/dom/clientrect.rs b/src/components/main/dom/clientrect.rs
index 3c9f6f9dca9..3c9f6f9dca9 100644
--- a/src/components/servo/dom/clientrect.rs
+++ b/src/components/main/dom/clientrect.rs
diff --git a/src/components/servo/dom/clientrectlist.rs b/src/components/main/dom/clientrectlist.rs
index ff48e6623be..ff48e6623be 100644
--- a/src/components/servo/dom/clientrectlist.rs
+++ b/src/components/main/dom/clientrectlist.rs
diff --git a/src/components/servo/dom/document.rs b/src/components/main/dom/document.rs
index 3dc72981f62..3dc72981f62 100644
--- a/src/components/servo/dom/document.rs
+++ b/src/components/main/dom/document.rs
diff --git a/src/components/servo/dom/domparser.rs b/src/components/main/dom/domparser.rs
index 8e8ed345a08..8e8ed345a08 100644
--- a/src/components/servo/dom/domparser.rs
+++ b/src/components/main/dom/domparser.rs
diff --git a/src/components/servo/dom/element.rs b/src/components/main/dom/element.rs
index 6438d78410d..6438d78410d 100644
--- a/src/components/servo/dom/element.rs
+++ b/src/components/main/dom/element.rs
diff --git a/src/components/servo/dom/event.rs b/src/components/main/dom/event.rs
index 7b1fba2ac37..7b1fba2ac37 100644
--- a/src/components/servo/dom/event.rs
+++ b/src/components/main/dom/event.rs
diff --git a/src/components/servo/dom/eventtarget.rs b/src/components/main/dom/eventtarget.rs
index b216b7d0cca..b216b7d0cca 100644
--- a/src/components/servo/dom/eventtarget.rs
+++ b/src/components/main/dom/eventtarget.rs
diff --git a/src/components/servo/dom/htmlcollection.rs b/src/components/main/dom/htmlcollection.rs
index 0641987b341..0641987b341 100644
--- a/src/components/servo/dom/htmlcollection.rs
+++ b/src/components/main/dom/htmlcollection.rs
diff --git a/src/components/servo/dom/node.rs b/src/components/main/dom/node.rs
index 5ae3656e75e..5ae3656e75e 100644
--- a/src/components/servo/dom/node.rs
+++ b/src/components/main/dom/node.rs
diff --git a/src/components/servo/dom/window.rs b/src/components/main/dom/window.rs
index c7eaacd7f31..c7eaacd7f31 100644
--- a/src/components/servo/dom/window.rs
+++ b/src/components/main/dom/window.rs
diff --git a/src/components/servo/engine.rs b/src/components/main/engine.rs
index 3a0e4f45e99..3a0e4f45e99 100644
--- a/src/components/servo/engine.rs
+++ b/src/components/main/engine.rs
diff --git a/src/components/servo/html/cssparse.rs b/src/components/main/html/cssparse.rs
index 9ee789d6e3e..9ee789d6e3e 100644
--- a/src/components/servo/html/cssparse.rs
+++ b/src/components/main/html/cssparse.rs
diff --git a/src/components/servo/html/hubbub_html_parser.rs b/src/components/main/html/hubbub_html_parser.rs
index 549f6ec5b0a..549f6ec5b0a 100644
--- a/src/components/servo/html/hubbub_html_parser.rs
+++ b/src/components/main/html/hubbub_html_parser.rs
diff --git a/src/components/servo/image.rs b/src/components/main/image.rs
index d03b93b1a11..d03b93b1a11 100644
--- a/src/components/servo/image.rs
+++ b/src/components/main/image.rs
diff --git a/src/components/servo/layout/aux.rs b/src/components/main/layout/aux.rs
index 8a311098d13..8a311098d13 100644
--- a/src/components/servo/layout/aux.rs
+++ b/src/components/main/layout/aux.rs
diff --git a/src/components/servo/layout/block.rs b/src/components/main/layout/block.rs
index 1d0ec0f9d86..1d0ec0f9d86 100644
--- a/src/components/servo/layout/block.rs
+++ b/src/components/main/layout/block.rs
diff --git a/src/components/servo/layout/box.rs b/src/components/main/layout/box.rs
index f66f739218a..f66f739218a 100644
--- a/src/components/servo/layout/box.rs
+++ b/src/components/main/layout/box.rs
diff --git a/src/components/servo/layout/box_builder.rs b/src/components/main/layout/box_builder.rs
index 12ad9aa199f..12ad9aa199f 100644
--- a/src/components/servo/layout/box_builder.rs
+++ b/src/components/main/layout/box_builder.rs
diff --git a/src/components/servo/layout/context.rs b/src/components/main/layout/context.rs
index 8646b9faabc..8646b9faabc 100644
--- a/src/components/servo/layout/context.rs
+++ b/src/components/main/layout/context.rs
diff --git a/src/components/servo/layout/debug.rs b/src/components/main/layout/debug.rs
index cbee6b8cf26..cbee6b8cf26 100644
--- a/src/components/servo/layout/debug.rs
+++ b/src/components/main/layout/debug.rs
diff --git a/src/components/servo/layout/display_list_builder.rs b/src/components/main/layout/display_list_builder.rs
index 1d0ea27b7e5..1d0ea27b7e5 100644
--- a/src/components/servo/layout/display_list_builder.rs
+++ b/src/components/main/layout/display_list_builder.rs
diff --git a/src/components/servo/layout/flow.rs b/src/components/main/layout/flow.rs
index b28f11867f6..b28f11867f6 100644
--- a/src/components/servo/layout/flow.rs
+++ b/src/components/main/layout/flow.rs
diff --git a/src/components/servo/layout/inline.rs b/src/components/main/layout/inline.rs
index 237f3ca29de..237f3ca29de 100644
--- a/src/components/servo/layout/inline.rs
+++ b/src/components/main/layout/inline.rs
diff --git a/src/components/servo/layout/layout_task.rs b/src/components/main/layout/layout_task.rs
index 66decaa62b9..66decaa62b9 100644
--- a/src/components/servo/layout/layout_task.rs
+++ b/src/components/main/layout/layout_task.rs
diff --git a/src/components/servo/layout/text.rs b/src/components/main/layout/text.rs
index 57f0a7db870..57f0a7db870 100644
--- a/src/components/servo/layout/text.rs
+++ b/src/components/main/layout/text.rs
diff --git a/src/components/servo/macros.rs b/src/components/main/macros.rs
index 8fe65bccfb6..8fe65bccfb6 100644
--- a/src/components/servo/macros.rs
+++ b/src/components/main/macros.rs
diff --git a/src/components/servo/platform/common/glut_windowing.rs b/src/components/main/platform/common/glut_windowing.rs
index 1e33c66b277..1e33c66b277 100644
--- a/src/components/servo/platform/common/glut_windowing.rs
+++ b/src/components/main/platform/common/glut_windowing.rs
diff --git a/src/components/servo/platform/common/shared_gl_windowing.rs b/src/components/main/platform/common/shared_gl_windowing.rs
index aa4a84b12cd..aa4a84b12cd 100644
--- a/src/components/servo/platform/common/shared_gl_windowing.rs
+++ b/src/components/main/platform/common/shared_gl_windowing.rs
diff --git a/src/components/servo/platform/mod.rs b/src/components/main/platform/mod.rs
index fdbd3bf42d9..fdbd3bf42d9 100644
--- a/src/components/servo/platform/mod.rs
+++ b/src/components/main/platform/mod.rs
diff --git a/src/components/servo/scripting/script_task.rs b/src/components/main/scripting/script_task.rs
index fb01adef9b7..fb01adef9b7 100644
--- a/src/components/servo/scripting/script_task.rs
+++ b/src/components/main/scripting/script_task.rs
diff --git a/src/components/servo/servo.rc b/src/components/main/servo.rc
index 5274a52a668..52070cb7891 100755
--- a/src/components/servo/servo.rc
+++ b/src/components/main/servo.rc
@@ -14,7 +14,7 @@
 extern mod alert;
 extern mod azure;
 extern mod geom;
-extern mod gfx (name = "servo_gfx");
+extern mod gfx (name = "gfx");
 extern mod glut;
 extern mod http_client;
 extern mod hubbub;
@@ -22,8 +22,8 @@ extern mod js;
 extern mod layers;
 extern mod newcss (name = "css");
 extern mod opengles;
-extern mod servo_net;
-extern mod servo_util (name = "servo_util");
+extern mod servo_net (name = "net");
+extern mod servo_util (name = "util");
 extern mod sharegl;
 extern mod stb_image;
 extern mod std;
diff --git a/src/components/servo/util/mod.rs b/src/components/main/util/mod.rs
index 5534317e53f..5534317e53f 100644
--- a/src/components/servo/util/mod.rs
+++ b/src/components/main/util/mod.rs
diff --git a/src/components/servo/util/task.rs b/src/components/main/util/task.rs
index bc36764a464..bc36764a464 100644
--- a/src/components/servo/util/task.rs
+++ b/src/components/main/util/task.rs
diff --git a/src/components/servo/windowing.rs b/src/components/main/windowing.rs
index 708ea4105ec..708ea4105ec 100644
--- a/src/components/servo/windowing.rs
+++ b/src/components/main/windowing.rs
diff --git a/src/components/servo-net/file_loader.rs b/src/components/net/file_loader.rs
index e7d03c091eb..e7d03c091eb 100644
--- a/src/components/servo-net/file_loader.rs
+++ b/src/components/net/file_loader.rs
diff --git a/src/components/servo-net/http_loader.rs b/src/components/net/http_loader.rs
index 72e9e0acd30..72e9e0acd30 100644
--- a/src/components/servo-net/http_loader.rs
+++ b/src/components/net/http_loader.rs
diff --git a/src/components/servo-net/image/base.rs b/src/components/net/image/base.rs
index ae9324c41f2..ae9324c41f2 100644
--- a/src/components/servo-net/image/base.rs
+++ b/src/components/net/image/base.rs
diff --git a/src/components/servo-net/image/holder.rs b/src/components/net/image/holder.rs
index 605eea39411..605eea39411 100644
--- a/src/components/servo-net/image/holder.rs
+++ b/src/components/net/image/holder.rs
diff --git a/src/components/servo-net/image/test.jpeg b/src/components/net/image/test.jpeg
index 1a0bdb7acd1..1a0bdb7acd1 100644
--- a/src/components/servo-net/image/test.jpeg
+++ b/src/components/net/image/test.jpeg
diff --git a/src/components/servo-net/image_cache_task.rs b/src/components/net/image_cache_task.rs
index 8806b3e7da6..8806b3e7da6 100644
--- a/src/components/servo-net/image_cache_task.rs
+++ b/src/components/net/image_cache_task.rs
diff --git a/src/components/servo-net/local_image_cache.rs b/src/components/net/local_image_cache.rs
index abdaba88c42..abdaba88c42 100644
--- a/src/components/servo-net/local_image_cache.rs
+++ b/src/components/net/local_image_cache.rs
diff --git a/src/components/servo-net/servo_net.rc b/src/components/net/net.rc
index 739ec49c637..768dccf461b 100644
--- a/src/components/servo-net/servo_net.rc
+++ b/src/components/net/net.rc
@@ -2,7 +2,7 @@
  * 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/. */
 
-#[link(name = "servo_net",
+#[link(name = "net",
        vers = "0.1",
        uuid = "69c2b7b7-0d7d-4514-a48a-0eed61476039",
        url = "http://servo.org/")];
@@ -10,7 +10,7 @@
 
 extern mod geom;
 extern mod http_client;
-extern mod servo_util;
+extern mod servo_util (name = "util");
 extern mod stb_image;
 extern mod std;
 
diff --git a/src/components/servo-net/resource_task.rs b/src/components/net/resource_task.rs
index 8fef9095387..8fef9095387 100644
--- a/src/components/servo-net/resource_task.rs
+++ b/src/components/net/resource_task.rs
diff --git a/src/components/servo-net/util.rs b/src/components/net/util.rs
index ec1aea92e86..ec1aea92e86 100644
--- a/src/components/servo-net/util.rs
+++ b/src/components/net/util.rs
diff --git a/src/components/servo-util/cache.rs b/src/components/util/cache.rs
index d6c46065ee7..d6c46065ee7 100644
--- a/src/components/servo-util/cache.rs
+++ b/src/components/util/cache.rs
diff --git a/src/components/servo-util/range.rs b/src/components/util/range.rs
index bc5728aa006..bc5728aa006 100644
--- a/src/components/servo-util/range.rs
+++ b/src/components/util/range.rs
diff --git a/src/components/servo-util/time.rs b/src/components/util/time.rs
index 8bb698981f0..8bb698981f0 100644
--- a/src/components/servo-util/time.rs
+++ b/src/components/util/time.rs
diff --git a/src/components/servo-util/tree.rs b/src/components/util/tree.rs
index 23b8ca80d77..23b8ca80d77 100644
--- a/src/components/servo-util/tree.rs
+++ b/src/components/util/tree.rs
diff --git a/src/components/servo-util/url.rs b/src/components/util/url.rs
index fea0df23b73..fea0df23b73 100644
--- a/src/components/servo-util/url.rs
+++ b/src/components/util/url.rs
diff --git a/src/components/servo-util/servo_util.rc b/src/components/util/util.rc
index 5779542af3a..20ef07f01bf 100644
--- a/src/components/servo-util/servo_util.rc
+++ b/src/components/util/util.rc
@@ -2,7 +2,7 @@
  * 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/. */
 
-#[link(name = "servo_util",
+#[link(name = "util",
        vers = "0.1",
        uuid = "48421f49-17cf-41c5-a68e-ff669ff2ecd5",
        url = "http://servo.org/")];
diff --git a/src/components/servo-util/vec.rs b/src/components/util/vec.rs
index 8a0ebf9edfa..8a0ebf9edfa 100644
--- a/src/components/servo-util/vec.rs
+++ b/src/components/util/vec.rs