diff --git a/src/libcore/char.rs b/src/libcore/char/mod.rs
similarity index 99%
rename from src/libcore/char.rs
rename to src/libcore/char/mod.rs
index 6e2626cc362b..c6b620e5238c 100644
--- a/src/libcore/char.rs
+++ b/src/libcore/char/mod.rs
@@ -15,7 +15,9 @@
 #![allow(non_snake_case)]
 #![stable(feature = "core_char", since = "1.2.0")]
 
-use char_private::is_printable;
+mod printable;
+
+use self::printable::is_printable;
 use convert::TryFrom;
 use fmt::{self, Write};
 use slice;
diff --git a/src/etc/char_private.py b/src/libcore/char/printable.py
similarity index 98%
rename from src/etc/char_private.py
rename to src/libcore/char/printable.py
index cfe5b01e934e..484822e10aa7 100644
--- a/src/etc/char_private.py
+++ b/src/libcore/char/printable.py
@@ -187,7 +187,7 @@ def main():
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// NOTE: The following code was generated by "src/etc/char_private.py",
+// NOTE: The following code was generated by "src/libcore/char/printable.py",
 //       do not edit directly!
 
 fn check(x: u16, singletonuppers: &[(u8, u8)], singletonlowers: &[u8],
diff --git a/src/libcore/char_private.rs b/src/libcore/char/printable.rs
similarity index 99%
rename from src/libcore/char_private.rs
rename to src/libcore/char/printable.rs
index e6803745ab54..ce011fab1878 100644
--- a/src/libcore/char_private.rs
+++ b/src/libcore/char/printable.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// NOTE: The following code was generated by "src/etc/char_private.py",
+// NOTE: The following code was generated by "src/libcore/char/printable.py",
 //       do not edit directly!
 
 fn check(x: u16, singletonuppers: &[(u8, u8)], singletonlowers: &[u8],
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 7cb635a299ae..9ff8465bc0f2 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -187,7 +187,6 @@ pub mod unicode;
 pub mod heap;
 
 // note: does not need to be public
-mod char_private;
 mod iter_private;
 mod tuple;
 mod unit;