diff --git a/src/librand/chacha.rs b/src/chacha.rs
similarity index 100%
rename from src/librand/chacha.rs
rename to src/chacha.rs
diff --git a/src/librand/distributions/exponential.rs b/src/distributions/exponential.rs
similarity index 100%
rename from src/librand/distributions/exponential.rs
rename to src/distributions/exponential.rs
diff --git a/src/librand/distributions/gamma.rs b/src/distributions/gamma.rs
similarity index 100%
rename from src/librand/distributions/gamma.rs
rename to src/distributions/gamma.rs
diff --git a/src/librand/distributions/mod.rs b/src/distributions/mod.rs
similarity index 100%
rename from src/librand/distributions/mod.rs
rename to src/distributions/mod.rs
diff --git a/src/librand/distributions/normal.rs b/src/distributions/normal.rs
similarity index 100%
rename from src/librand/distributions/normal.rs
rename to src/distributions/normal.rs
diff --git a/src/librand/distributions/range.rs b/src/distributions/range.rs
similarity index 100%
rename from src/librand/distributions/range.rs
rename to src/distributions/range.rs
diff --git a/src/librand/distributions/ziggurat_tables.rs b/src/distributions/ziggurat_tables.rs
similarity index 100%
rename from src/librand/distributions/ziggurat_tables.rs
rename to src/distributions/ziggurat_tables.rs
diff --git a/src/librand/isaac.rs b/src/isaac.rs
similarity index 100%
rename from src/librand/isaac.rs
rename to src/isaac.rs
diff --git a/src/librand/lib.rs b/src/lib.rs
similarity index 99%
rename from src/librand/lib.rs
rename to src/lib.rs
index ebe72cee..3ff40038 100644
--- a/src/librand/lib.rs
+++ b/src/lib.rs
@@ -22,7 +22,7 @@
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/nightly/",
        html_playground_url = "http://play.rust-lang.org/")]
-#![allow(unknown_features)] #![feature(int_uint)]
+#![feature(int_uint)]
 #![no_std]
 #![unstable(feature = "rand")]
 #![feature(staged_api)]
diff --git a/src/librand/rand_impls.rs b/src/rand_impls.rs
similarity index 100%
rename from src/librand/rand_impls.rs
rename to src/rand_impls.rs
diff --git a/src/librand/reseeding.rs b/src/reseeding.rs
similarity index 100%
rename from src/librand/reseeding.rs
rename to src/reseeding.rs