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
similarity index 100%
rename from src/components/servo-gfx/color.rs
rename to src/components/gfx/color.rs
diff --git a/src/components/servo-gfx/compositor.rs b/src/components/gfx/compositor.rs
similarity index 100%
rename from src/components/servo-gfx/compositor.rs
rename to src/components/gfx/compositor.rs
diff --git a/src/components/servo-gfx/display_list.rs b/src/components/gfx/display_list.rs
similarity index 100%
rename from src/components/servo-gfx/display_list.rs
rename to src/components/gfx/display_list.rs
diff --git a/src/components/servo-gfx/font.rs b/src/components/gfx/font.rs
similarity index 100%
rename from src/components/servo-gfx/font.rs
rename to src/components/gfx/font.rs
diff --git a/src/components/servo-gfx/font_context.rs b/src/components/gfx/font_context.rs
similarity index 100%
rename from src/components/servo-gfx/font_context.rs
rename to src/components/gfx/font_context.rs
diff --git a/src/components/servo-gfx/font_list.rs b/src/components/gfx/font_list.rs
similarity index 100%
rename from src/components/servo-gfx/font_list.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/freetype_impl/font_context.rs
rename to src/components/gfx/freetype_impl/font_context.rs
diff --git a/src/components/servo-gfx/geometry.rs b/src/components/gfx/geometry.rs
similarity index 100%
rename from src/components/servo-gfx/geometry.rs
rename to src/components/gfx/geometry.rs
diff --git a/src/components/servo-gfx/servo_gfx.rc b/src/components/gfx/gfx.rc
similarity index 93%
rename from src/components/servo-gfx/servo_gfx.rc
rename to 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
similarity index 100%
rename from src/components/servo-gfx/native.rs
rename to src/components/gfx/native.rs
diff --git a/src/components/servo-gfx/opts.rs b/src/components/gfx/opts.rs
similarity index 100%
rename from src/components/servo-gfx/opts.rs
rename to src/components/gfx/opts.rs
diff --git a/src/components/servo-gfx/platform/linux/font.rs b/src/components/gfx/platform/linux/font.rs
similarity index 100%
rename from src/components/servo-gfx/platform/linux/font.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/platform/linux/font_context.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/platform/linux/font_list.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/platform/macos/font.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/platform/macos/font_context.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/platform/macos/font_list.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/platform/mod.rs
rename to src/components/gfx/platform/mod.rs
diff --git a/src/components/servo-gfx/render_context.rs b/src/components/gfx/render_context.rs
similarity index 100%
rename from src/components/servo-gfx/render_context.rs
rename to src/components/gfx/render_context.rs
diff --git a/src/components/servo-gfx/render_layers.rs b/src/components/gfx/render_layers.rs
similarity index 100%
rename from src/components/servo-gfx/render_layers.rs
rename to src/components/gfx/render_layers.rs
diff --git a/src/components/servo-gfx/render_task.rs b/src/components/gfx/render_task.rs
similarity index 100%
rename from src/components/servo-gfx/render_task.rs
rename to src/components/gfx/render_task.rs
diff --git a/src/components/servo-gfx/surface.rs b/src/components/gfx/surface.rs
similarity index 100%
rename from src/components/servo-gfx/surface.rs
rename to src/components/gfx/surface.rs
diff --git a/src/components/servo-gfx/text/glyph.rs b/src/components/gfx/text/glyph.rs
similarity index 100%
rename from src/components/servo-gfx/text/glyph.rs
rename to src/components/gfx/text/glyph.rs
diff --git a/src/components/servo-gfx/text/mod.rs b/src/components/gfx/text/mod.rs
similarity index 100%
rename from src/components/servo-gfx/text/mod.rs
rename to src/components/gfx/text/mod.rs
diff --git a/src/components/servo-gfx/text/shaper.rs b/src/components/gfx/text/shaper.rs
similarity index 100%
rename from src/components/servo-gfx/text/shaper.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/text/shaping/harfbuzz.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/text/shaping/mod.rs
rename to 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
similarity index 100%
rename from src/components/servo-gfx/text/text_run.rs
rename to src/components/gfx/text/text_run.rs
diff --git a/src/components/servo-gfx/text/util.rs b/src/components/gfx/text/util.rs
similarity index 100%
rename from src/components/servo-gfx/text/util.rs
rename to src/components/gfx/text/util.rs
diff --git a/src/components/servo/compositing/mod.rs b/src/components/main/compositing/mod.rs
similarity index 100%
rename from src/components/servo/compositing/mod.rs
rename to 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
similarity index 100%
rename from src/components/servo/compositing/resize_rate_limiter.rs
rename to src/components/main/compositing/resize_rate_limiter.rs
diff --git a/src/components/servo/css/matching.rs b/src/components/main/css/matching.rs
similarity index 100%
rename from src/components/servo/css/matching.rs
rename to src/components/main/css/matching.rs
diff --git a/src/components/servo/css/node_style.rs b/src/components/main/css/node_style.rs
similarity index 100%
rename from src/components/servo/css/node_style.rs
rename to 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
similarity index 100%
rename from src/components/servo/css/node_util.rs
rename to 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
similarity index 100%
rename from src/components/servo/css/node_void_ptr.rs
rename to src/components/main/css/node_void_ptr.rs
diff --git a/src/components/servo/css/select.rs b/src/components/main/css/select.rs
similarity index 100%
rename from src/components/servo/css/select.rs
rename to src/components/main/css/select.rs
diff --git a/src/components/servo/css/select_handler.rs b/src/components/main/css/select_handler.rs
similarity index 100%
rename from src/components/servo/css/select_handler.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/clientrect.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/clientrectlist.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/BindingGen.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/BindingUtils.cpp
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/BindingUtils.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/Bindings.conf
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/ClientRect.webidl
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/ClientRectList.webidl
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/Codegen.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/CodegenRust.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/Configuration.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/DOMJSClass.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.cpp
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/DOMJSProxyHandler.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/DOMParser.webidl
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/ErrorResult.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/Errors.msg
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/Event.webidl
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/EventTarget.webidl
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/GlobalGen.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/HTMLCollection.webidl
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/Makefile.in
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/Nullable.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/PrimitiveConversions.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/RegisterBindings.cpp
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/RegisterBindings.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/TypedArray.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/crashtests/769464.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/crashtests/crashtests.list
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/README
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/UPSTREAM
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/WebIDL.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/runtests.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_any_null.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_argument_identifier_conflicts.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_argument_novoid.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_array_of_interface.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_arraybuffer.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_attr.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_attr_sequence_type.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_builtin_filename.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_builtins.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_callback.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_callback_interface.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_const.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_constructor.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_constructor_no_interface_object.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_deduplicate.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_dictionary.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_distinguishability.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_double_null.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_duplicate_qualifiers.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_empty_enum.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_enum.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_enum_duplicate_values.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_error_colno.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_error_lineno.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_extended_attributes.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_forward_decl.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_implements.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_parent.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_incomplete_types.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_interface.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_interface_const_identifier_conflicts.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_interface_identifier_conflicts_across_members.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_method.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_equivalency.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_nullable_void.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_optional_constraints.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_overload.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_sanity.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_special_method_signature_mismatch.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_special_methods_uniqueness.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_treatNonCallableAsNull.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_typedef.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_union.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_union_any.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_union_nullable.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_callback.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/parser/tests/test_variadic_constraints.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/ply/COPYING
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/ply/README
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/ply/ply/__init__.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/ply/ply/lex.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/ply/ply/yacc.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/pythonpath.py
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.cpp
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/stubgenerator/Skeleton.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/stubgenerator/generate.sh
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/Makefile.in
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/TestBindingHeader.h
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/TestCodeGen.webidl
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/TestDictionary.webidl
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/TestTypedef.webidl
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/file_bug775543.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/forOf_iframe.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_InstanceOf.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_bug773326.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_bug775543.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_bug788369.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_enums.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_forOf.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_integers.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_interfaceToString.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_lookupGetter.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_sequence_wrapping.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/codegen/test/test_traceProtos.html
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/conversions.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/document.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/domparser.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/element.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/event.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/eventtarget.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/htmlcollection.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/node.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/proxyhandler.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/text.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/utils.rs
rename to 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
similarity index 100%
rename from src/components/servo/dom/bindings/window.rs
rename to src/components/main/dom/bindings/window.rs
diff --git a/src/components/servo/dom/characterdata.rs b/src/components/main/dom/characterdata.rs
similarity index 100%
rename from src/components/servo/dom/characterdata.rs
rename to src/components/main/dom/characterdata.rs
diff --git a/src/components/servo/dom/clientrect.rs b/src/components/main/dom/clientrect.rs
similarity index 100%
rename from src/components/servo/dom/clientrect.rs
rename to src/components/main/dom/clientrect.rs
diff --git a/src/components/servo/dom/clientrectlist.rs b/src/components/main/dom/clientrectlist.rs
similarity index 100%
rename from src/components/servo/dom/clientrectlist.rs
rename to src/components/main/dom/clientrectlist.rs
diff --git a/src/components/servo/dom/document.rs b/src/components/main/dom/document.rs
similarity index 100%
rename from src/components/servo/dom/document.rs
rename to src/components/main/dom/document.rs
diff --git a/src/components/servo/dom/domparser.rs b/src/components/main/dom/domparser.rs
similarity index 100%
rename from src/components/servo/dom/domparser.rs
rename to src/components/main/dom/domparser.rs
diff --git a/src/components/servo/dom/element.rs b/src/components/main/dom/element.rs
similarity index 100%
rename from src/components/servo/dom/element.rs
rename to src/components/main/dom/element.rs
diff --git a/src/components/servo/dom/event.rs b/src/components/main/dom/event.rs
similarity index 100%
rename from src/components/servo/dom/event.rs
rename to src/components/main/dom/event.rs
diff --git a/src/components/servo/dom/eventtarget.rs b/src/components/main/dom/eventtarget.rs
similarity index 100%
rename from src/components/servo/dom/eventtarget.rs
rename to src/components/main/dom/eventtarget.rs
diff --git a/src/components/servo/dom/htmlcollection.rs b/src/components/main/dom/htmlcollection.rs
similarity index 100%
rename from src/components/servo/dom/htmlcollection.rs
rename to src/components/main/dom/htmlcollection.rs
diff --git a/src/components/servo/dom/node.rs b/src/components/main/dom/node.rs
similarity index 100%
rename from src/components/servo/dom/node.rs
rename to src/components/main/dom/node.rs
diff --git a/src/components/servo/dom/window.rs b/src/components/main/dom/window.rs
similarity index 100%
rename from src/components/servo/dom/window.rs
rename to src/components/main/dom/window.rs
diff --git a/src/components/servo/engine.rs b/src/components/main/engine.rs
similarity index 100%
rename from src/components/servo/engine.rs
rename to src/components/main/engine.rs
diff --git a/src/components/servo/html/cssparse.rs b/src/components/main/html/cssparse.rs
similarity index 100%
rename from src/components/servo/html/cssparse.rs
rename to 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
similarity index 100%
rename from src/components/servo/html/hubbub_html_parser.rs
rename to src/components/main/html/hubbub_html_parser.rs
diff --git a/src/components/servo/image.rs b/src/components/main/image.rs
similarity index 100%
rename from src/components/servo/image.rs
rename to src/components/main/image.rs
diff --git a/src/components/servo/layout/aux.rs b/src/components/main/layout/aux.rs
similarity index 100%
rename from src/components/servo/layout/aux.rs
rename to src/components/main/layout/aux.rs
diff --git a/src/components/servo/layout/block.rs b/src/components/main/layout/block.rs
similarity index 100%
rename from src/components/servo/layout/block.rs
rename to src/components/main/layout/block.rs
diff --git a/src/components/servo/layout/box.rs b/src/components/main/layout/box.rs
similarity index 100%
rename from src/components/servo/layout/box.rs
rename to src/components/main/layout/box.rs
diff --git a/src/components/servo/layout/box_builder.rs b/src/components/main/layout/box_builder.rs
similarity index 100%
rename from src/components/servo/layout/box_builder.rs
rename to src/components/main/layout/box_builder.rs
diff --git a/src/components/servo/layout/context.rs b/src/components/main/layout/context.rs
similarity index 100%
rename from src/components/servo/layout/context.rs
rename to src/components/main/layout/context.rs
diff --git a/src/components/servo/layout/debug.rs b/src/components/main/layout/debug.rs
similarity index 100%
rename from src/components/servo/layout/debug.rs
rename to 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
similarity index 100%
rename from src/components/servo/layout/display_list_builder.rs
rename to src/components/main/layout/display_list_builder.rs
diff --git a/src/components/servo/layout/flow.rs b/src/components/main/layout/flow.rs
similarity index 100%
rename from src/components/servo/layout/flow.rs
rename to src/components/main/layout/flow.rs
diff --git a/src/components/servo/layout/inline.rs b/src/components/main/layout/inline.rs
similarity index 100%
rename from src/components/servo/layout/inline.rs
rename to src/components/main/layout/inline.rs
diff --git a/src/components/servo/layout/layout_task.rs b/src/components/main/layout/layout_task.rs
similarity index 100%
rename from src/components/servo/layout/layout_task.rs
rename to src/components/main/layout/layout_task.rs
diff --git a/src/components/servo/layout/text.rs b/src/components/main/layout/text.rs
similarity index 100%
rename from src/components/servo/layout/text.rs
rename to src/components/main/layout/text.rs
diff --git a/src/components/servo/macros.rs b/src/components/main/macros.rs
similarity index 100%
rename from src/components/servo/macros.rs
rename to 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
similarity index 100%
rename from src/components/servo/platform/common/glut_windowing.rs
rename to 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
similarity index 100%
rename from src/components/servo/platform/common/shared_gl_windowing.rs
rename to 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
similarity index 100%
rename from src/components/servo/platform/mod.rs
rename to src/components/main/platform/mod.rs
diff --git a/src/components/servo/scripting/script_task.rs b/src/components/main/scripting/script_task.rs
similarity index 100%
rename from src/components/servo/scripting/script_task.rs
rename to src/components/main/scripting/script_task.rs
diff --git a/src/components/servo/servo.rc b/src/components/main/servo.rc
similarity index 97%
rename from src/components/servo/servo.rc
rename to 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
similarity index 100%
rename from src/components/servo/util/mod.rs
rename to src/components/main/util/mod.rs
diff --git a/src/components/servo/util/task.rs b/src/components/main/util/task.rs
similarity index 100%
rename from src/components/servo/util/task.rs
rename to src/components/main/util/task.rs
diff --git a/src/components/servo/windowing.rs b/src/components/main/windowing.rs
similarity index 100%
rename from src/components/servo/windowing.rs
rename to src/components/main/windowing.rs
diff --git a/src/components/servo-net/file_loader.rs b/src/components/net/file_loader.rs
similarity index 100%
rename from src/components/servo-net/file_loader.rs
rename to src/components/net/file_loader.rs
diff --git a/src/components/servo-net/http_loader.rs b/src/components/net/http_loader.rs
similarity index 100%
rename from src/components/servo-net/http_loader.rs
rename to src/components/net/http_loader.rs
diff --git a/src/components/servo-net/image/base.rs b/src/components/net/image/base.rs
similarity index 100%
rename from src/components/servo-net/image/base.rs
rename to src/components/net/image/base.rs
diff --git a/src/components/servo-net/image/holder.rs b/src/components/net/image/holder.rs
similarity index 100%
rename from src/components/servo-net/image/holder.rs
rename to src/components/net/image/holder.rs
diff --git a/src/components/servo-net/image/test.jpeg b/src/components/net/image/test.jpeg
similarity index 100%
rename from src/components/servo-net/image/test.jpeg
rename to 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
similarity index 100%
rename from src/components/servo-net/image_cache_task.rs
rename to 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
similarity index 100%
rename from src/components/servo-net/local_image_cache.rs
rename to src/components/net/local_image_cache.rs
diff --git a/src/components/servo-net/servo_net.rc b/src/components/net/net.rc
similarity index 93%
rename from src/components/servo-net/servo_net.rc
rename to 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
similarity index 100%
rename from src/components/servo-net/resource_task.rs
rename to src/components/net/resource_task.rs
diff --git a/src/components/servo-net/util.rs b/src/components/net/util.rs
similarity index 100%
rename from src/components/servo-net/util.rs
rename to src/components/net/util.rs
diff --git a/src/components/servo-util/cache.rs b/src/components/util/cache.rs
similarity index 100%
rename from src/components/servo-util/cache.rs
rename to src/components/util/cache.rs
diff --git a/src/components/servo-util/range.rs b/src/components/util/range.rs
similarity index 100%
rename from src/components/servo-util/range.rs
rename to src/components/util/range.rs
diff --git a/src/components/servo-util/time.rs b/src/components/util/time.rs
similarity index 100%
rename from src/components/servo-util/time.rs
rename to src/components/util/time.rs
diff --git a/src/components/servo-util/tree.rs b/src/components/util/tree.rs
similarity index 100%
rename from src/components/servo-util/tree.rs
rename to src/components/util/tree.rs
diff --git a/src/components/servo-util/url.rs b/src/components/util/url.rs
similarity index 100%
rename from src/components/servo-util/url.rs
rename to src/components/util/url.rs
diff --git a/src/components/servo-util/servo_util.rc b/src/components/util/util.rc
similarity index 94%
rename from src/components/servo-util/servo_util.rc
rename to 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
similarity index 100%
rename from src/components/servo-util/vec.rs
rename to src/components/util/vec.rs