diff --git a/src/libarena/Cargo.toml b/src/librustc_arena/Cargo.toml
similarity index 100%
rename from src/libarena/Cargo.toml
rename to src/librustc_arena/Cargo.toml
diff --git a/src/libarena/lib.rs b/src/librustc_arena/lib.rs
similarity index 100%
rename from src/libarena/lib.rs
rename to src/librustc_arena/lib.rs
diff --git a/src/libarena/tests.rs b/src/librustc_arena/tests.rs
similarity index 100%
rename from src/libarena/tests.rs
rename to src/librustc_arena/tests.rs
diff --git a/src/libgraphviz/Cargo.toml b/src/librustc_graphviz/Cargo.toml
similarity index 100%
rename from src/libgraphviz/Cargo.toml
rename to src/librustc_graphviz/Cargo.toml
diff --git a/src/libgraphviz/lib.rs b/src/librustc_graphviz/lib.rs
similarity index 100%
rename from src/libgraphviz/lib.rs
rename to src/librustc_graphviz/lib.rs
diff --git a/src/libgraphviz/tests.rs b/src/librustc_graphviz/tests.rs
similarity index 100%
rename from src/libgraphviz/tests.rs
rename to src/librustc_graphviz/tests.rs
diff --git a/src/libfmt_macros/Cargo.toml b/src/librustc_parse_format/Cargo.toml
similarity index 100%
rename from src/libfmt_macros/Cargo.toml
rename to src/librustc_parse_format/Cargo.toml
diff --git a/src/libfmt_macros/lib.rs b/src/librustc_parse_format/lib.rs
similarity index 100%
rename from src/libfmt_macros/lib.rs
rename to src/librustc_parse_format/lib.rs
diff --git a/src/libfmt_macros/tests.rs b/src/librustc_parse_format/tests.rs
similarity index 100%
rename from src/libfmt_macros/tests.rs
rename to src/librustc_parse_format/tests.rs
diff --git a/src/libserialize/Cargo.toml b/src/librustc_serialize/Cargo.toml
similarity index 100%
rename from src/libserialize/Cargo.toml
rename to src/librustc_serialize/Cargo.toml
diff --git a/src/libserialize/collection_impls.rs b/src/librustc_serialize/collection_impls.rs
similarity index 100%
rename from src/libserialize/collection_impls.rs
rename to src/librustc_serialize/collection_impls.rs
diff --git a/src/libserialize/json.rs b/src/librustc_serialize/json.rs
similarity index 100%
rename from src/libserialize/json.rs
rename to src/librustc_serialize/json.rs
diff --git a/src/libserialize/json/tests.rs b/src/librustc_serialize/json/tests.rs
similarity index 100%
rename from src/libserialize/json/tests.rs
rename to src/librustc_serialize/json/tests.rs
diff --git a/src/libserialize/leb128.rs b/src/librustc_serialize/leb128.rs
similarity index 100%
rename from src/libserialize/leb128.rs
rename to src/librustc_serialize/leb128.rs
diff --git a/src/libserialize/lib.rs b/src/librustc_serialize/lib.rs
similarity index 100%
rename from src/libserialize/lib.rs
rename to src/librustc_serialize/lib.rs
diff --git a/src/libserialize/opaque.rs b/src/librustc_serialize/opaque.rs
similarity index 100%
rename from src/libserialize/opaque.rs
rename to src/librustc_serialize/opaque.rs
diff --git a/src/libserialize/serialize.rs b/src/librustc_serialize/serialize.rs
similarity index 100%
rename from src/libserialize/serialize.rs
rename to src/librustc_serialize/serialize.rs
diff --git a/src/libserialize/tests/json.rs b/src/librustc_serialize/tests/json.rs
similarity index 100%
rename from src/libserialize/tests/json.rs
rename to src/librustc_serialize/tests/json.rs
diff --git a/src/libserialize/tests/leb128.rs b/src/librustc_serialize/tests/leb128.rs
similarity index 100%
rename from src/libserialize/tests/leb128.rs
rename to src/librustc_serialize/tests/leb128.rs
diff --git a/src/libserialize/tests/opaque.rs b/src/librustc_serialize/tests/opaque.rs
similarity index 100%
rename from src/libserialize/tests/opaque.rs
rename to src/librustc_serialize/tests/opaque.rs