diff --git a/src/libcore/core.rc b/src/libcore/core.rc
index 34804af70ca..aece60652a2 100644
--- a/src/libcore/core.rc
+++ b/src/libcore/core.rc
@@ -60,30 +60,33 @@ pub mod prelude;
 
 /* Primitive types */
 
-#[path = "int-template.rs"] #[merge = "int-template/int.rs"]
+#[path = "num/int-template.rs"] #[merge = "num/int-template/int.rs"]
 pub mod int;
-#[path = "int-template.rs"] #[merge = "int-template/i8.rs"]
+#[path = "num/int-template.rs"] #[merge = "num/int-template/i8.rs"]
 pub mod i8;
-#[path = "int-template.rs"] #[merge = "int-template/i16.rs"]
+#[path = "num/int-template.rs"] #[merge = "num/int-template/i16.rs"]
 pub mod i16;
-#[path = "int-template.rs"] #[merge = "int-template/i32.rs"]
+#[path = "num/int-template.rs"] #[merge = "num/int-template/i32.rs"]
 pub mod i32;
-#[path = "int-template.rs"] #[merge = "int-template/i64.rs"]
+#[path = "num/int-template.rs"] #[merge = "num/int-template/i64.rs"]
 pub mod i64;
-#[path = "uint-template.rs"] #[merge = "uint-template/uint.rs"]
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/uint.rs"]
 pub mod uint;
 
-#[path = "uint-template.rs"] #[merge = "uint-template/u8.rs"]
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/u8.rs"]
 pub mod u8;
-#[path = "uint-template.rs"] #[merge = "uint-template/u16.rs"]
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/u16.rs"]
 pub mod u16;
-#[path = "uint-template.rs"] #[merge = "uint-template/u32.rs"]
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/u32.rs"]
 pub mod u32;
-#[path = "uint-template.rs"] #[merge = "uint-template/u64.rs"]
+#[path = "num/uint-template.rs"] #[merge = "num/uint-template/u64.rs"]
 pub mod u64;
 
+#[path = "num/float.rs"]
 pub mod float;
+#[path = "num/f32.rs"]
 pub mod f32;
+#[path = "num/f64.rs"]
 pub mod f64;
 
 pub mod nil;
@@ -116,6 +119,7 @@ pub mod managed;
 /* Common traits */
 
 pub mod from_str;
+#[path = "num/num.rs"]
 pub mod num;
 pub mod iter;
 pub mod to_str;
@@ -232,6 +236,7 @@ pub mod private;
 /* For internal use, not exported */
 
 mod unicode;
+#[path = "num/cmath.rs"]
 mod cmath;
 mod stackwalk;
 
diff --git a/src/libcore/cmath.rs b/src/libcore/num/cmath.rs
similarity index 100%
rename from src/libcore/cmath.rs
rename to src/libcore/num/cmath.rs
diff --git a/src/libcore/f32.rs b/src/libcore/num/f32.rs
similarity index 100%
rename from src/libcore/f32.rs
rename to src/libcore/num/f32.rs
diff --git a/src/libcore/f64.rs b/src/libcore/num/f64.rs
similarity index 100%
rename from src/libcore/f64.rs
rename to src/libcore/num/f64.rs
diff --git a/src/libcore/float.rs b/src/libcore/num/float.rs
similarity index 100%
rename from src/libcore/float.rs
rename to src/libcore/num/float.rs
diff --git a/src/libcore/int-template.rs b/src/libcore/num/int-template.rs
similarity index 100%
rename from src/libcore/int-template.rs
rename to src/libcore/num/int-template.rs
diff --git a/src/libcore/int-template/i16.rs b/src/libcore/num/int-template/i16.rs
similarity index 100%
rename from src/libcore/int-template/i16.rs
rename to src/libcore/num/int-template/i16.rs
diff --git a/src/libcore/int-template/i32.rs b/src/libcore/num/int-template/i32.rs
similarity index 100%
rename from src/libcore/int-template/i32.rs
rename to src/libcore/num/int-template/i32.rs
diff --git a/src/libcore/int-template/i64.rs b/src/libcore/num/int-template/i64.rs
similarity index 100%
rename from src/libcore/int-template/i64.rs
rename to src/libcore/num/int-template/i64.rs
diff --git a/src/libcore/int-template/i8.rs b/src/libcore/num/int-template/i8.rs
similarity index 100%
rename from src/libcore/int-template/i8.rs
rename to src/libcore/num/int-template/i8.rs
diff --git a/src/libcore/int-template/int.rs b/src/libcore/num/int-template/int.rs
similarity index 100%
rename from src/libcore/int-template/int.rs
rename to src/libcore/num/int-template/int.rs
diff --git a/src/libcore/num.rs b/src/libcore/num/num.rs
similarity index 100%
rename from src/libcore/num.rs
rename to src/libcore/num/num.rs
diff --git a/src/libcore/uint-template.rs b/src/libcore/num/uint-template.rs
similarity index 100%
rename from src/libcore/uint-template.rs
rename to src/libcore/num/uint-template.rs
diff --git a/src/libcore/uint-template/u16.rs b/src/libcore/num/uint-template/u16.rs
similarity index 100%
rename from src/libcore/uint-template/u16.rs
rename to src/libcore/num/uint-template/u16.rs
diff --git a/src/libcore/uint-template/u32.rs b/src/libcore/num/uint-template/u32.rs
similarity index 100%
rename from src/libcore/uint-template/u32.rs
rename to src/libcore/num/uint-template/u32.rs
diff --git a/src/libcore/uint-template/u64.rs b/src/libcore/num/uint-template/u64.rs
similarity index 100%
rename from src/libcore/uint-template/u64.rs
rename to src/libcore/num/uint-template/u64.rs
diff --git a/src/libcore/uint-template/u8.rs b/src/libcore/num/uint-template/u8.rs
similarity index 100%
rename from src/libcore/uint-template/u8.rs
rename to src/libcore/num/uint-template/u8.rs
diff --git a/src/libcore/uint-template/uint.rs b/src/libcore/num/uint-template/uint.rs
similarity index 100%
rename from src/libcore/uint-template/uint.rs
rename to src/libcore/num/uint-template/uint.rs