diff --git a/src/servo/gfx/renderer.rs b/src/servo/gfx/renderer.rs
index 2d7f2a19dc9..34a42aec65b 100644
--- a/src/servo/gfx/renderer.rs
+++ b/src/servo/gfx/renderer.rs
@@ -1,3 +1,4 @@
+import platform::osmain;
 import geom::*;
 import comm::*;
 import layout::display_list::*;
diff --git a/src/servo/osmain.rs b/src/servo/platform/osmain.rs
similarity index 100%
rename from src/servo/osmain.rs
rename to src/servo/platform/osmain.rs
diff --git a/src/servo/servo.rc b/src/servo/servo.rc
index 27e0e0c2edf..0c89da6ad09 100755
--- a/src/servo/servo.rc
+++ b/src/servo/servo.rc
@@ -39,11 +39,10 @@ mod parser {
 
 mod platform {
     mod base;
+    mod osmain;
 }
 
 mod util {
     mod tree;
 }
 
-mod osmain;
-
diff --git a/src/servo/servo.rs b/src/servo/servo.rs
index 0484cc305aa..6b7fa7f7e77 100644
--- a/src/servo/servo.rs
+++ b/src/servo/servo.rs
@@ -25,7 +25,7 @@ fn main(args: [str]) {
     }
 
     // The platform event handler thread
-    let osmain = osmain::osmain();
+    let osmain = platform::osmain::osmain();
 
     // The compositor
     let renderer = gfx::renderer::renderer(osmain);
@@ -35,7 +35,7 @@ fn main(args: [str]) {
 
     // The keyboard handler
     let key_po = port();
-    send(osmain, osmain::add_key_handler(chan(key_po)));
+    send(osmain, platform::osmain::add_key_handler(chan(key_po)));
 
     loop {
         send(layout, layout::layout::build);
@@ -49,7 +49,7 @@ fn main(args: [str]) {
             comm::send(renderer, gfx::renderer::exit(comm::chan(draw_exit_confirm_po)));
 
             comm::recv(draw_exit_confirm_po);
-            comm::send(osmain, osmain::exit);
+            comm::send(osmain, platform::osmain::exit);
             break;
         }
     }