diff --git a/Makefile.in b/Makefile.in
index c89415d78bf..43577059745 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,11 +9,11 @@ RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
 all:    servo
 
 servo:	\
-	src/servo.rc $(RUST_SRC)
+	src/servo/servo.rc $(RUST_SRC)
 	$(RUSTC) $(RUSTFLAGS) -o $@ $<
 
 servo-test: \
-	src/servo.rc $(RUST_SRC)
+	src/servo/servo.rc $(RUST_SRC)
 	$(RUSTC) $(RUSTFLAGS) --test -o $@ $<
 
 .PHONY:	clean
@@ -22,4 +22,4 @@ clean:
 
 .PHONY: test
 test:	servo-test
-	./servo-test
\ No newline at end of file
+	./servo-test
diff --git a/src/dom/base.rs b/src/servo/dom/base.rs
similarity index 100%
rename from src/dom/base.rs
rename to src/servo/dom/base.rs
diff --git a/src/dom/rcu.rs b/src/servo/dom/rcu.rs
similarity index 100%
rename from src/dom/rcu.rs
rename to src/servo/dom/rcu.rs
diff --git a/src/gfx/geom.rs b/src/servo/gfx/geom.rs
similarity index 100%
rename from src/gfx/geom.rs
rename to src/servo/gfx/geom.rs
diff --git a/src/gfx/surface.rs b/src/servo/gfx/surface.rs
similarity index 100%
rename from src/gfx/surface.rs
rename to src/servo/gfx/surface.rs
diff --git a/src/image/encode/tga.rs b/src/servo/image/encode/tga.rs
similarity index 100%
rename from src/image/encode/tga.rs
rename to src/servo/image/encode/tga.rs
diff --git a/src/layout/base.rs b/src/servo/layout/base.rs
similarity index 100%
rename from src/layout/base.rs
rename to src/servo/layout/base.rs
diff --git a/src/servo.rc b/src/servo/servo.rc
similarity index 100%
rename from src/servo.rc
rename to src/servo/servo.rc
diff --git a/src/util/tree.rs b/src/servo/util/tree.rs
similarity index 100%
rename from src/util/tree.rs
rename to src/servo/util/tree.rs
diff --git a/src/widget/base.rs b/src/servo/widget/base.rs
similarity index 100%
rename from src/widget/base.rs
rename to src/servo/widget/base.rs