diff --git a/src/cargo/cargo.rs b/src/cargo/cargo.rs
index 990bbfecde60..7d01fb4d35ca 100644
--- a/src/cargo/cargo.rs
+++ b/src/cargo/cargo.rs
@@ -2,8 +2,8 @@
 
 import syntax::{ast, codemap};
 import syntax::parse;
-import rustc::util::filesearch::{get_cargo_root, get_cargo_root_nearest,
-                                 get_cargo_sysroot, libdir};
+import rustc::metadata::filesearch::{get_cargo_root, get_cargo_root_nearest,
+                                     get_cargo_sysroot, libdir};
 import syntax::diagnostic;
 
 import result::{ok, err};
diff --git a/src/rustc/back/link.rs b/src/rustc/back/link.rs
index 365d77522398..db87084fc1ba 100644
--- a/src/rustc/back/link.rs
+++ b/src/rustc/back/link.rs
@@ -13,7 +13,7 @@ import syntax::ast;
 import syntax::print::pprust;
 import lib::llvm::{ModuleRef, mk_pass_manager, mk_target_data, True, False,
         FileType};
-import util::filesearch;
+import metadata::filesearch;
 import syntax::ast_map::{path, path_mod, path_name};
 
 enum output_type {
diff --git a/src/rustc/back/rpath.rs b/src/rustc/back/rpath.rs
index 7c5a2edf68f2..675f1c437457 100644
--- a/src/rustc/back/rpath.rs
+++ b/src/rustc/back/rpath.rs
@@ -2,7 +2,7 @@ import std::map;
 import std::map::hashmap;
 import metadata::cstore;
 import driver::session;
-import util::filesearch;
+import metadata::filesearch;
 
 export get_rpath_flags;
 
diff --git a/src/rustc/driver/driver.rs b/src/rustc/driver/driver.rs
index 76b7cfa76cdd..e0c63ca984bb 100644
--- a/src/rustc/driver/driver.rs
+++ b/src/rustc/driver/driver.rs
@@ -1,12 +1,12 @@
 // -*- rust -*-
-import metadata::{creader, cstore};
+import metadata::{creader, cstore, filesearch};
 import session::session;
 import syntax::parse;
 import syntax::{ast, codemap};
 import syntax::attr;
 import middle::{trans, resolve, freevars, kind, ty, typeck, lint};
 import syntax::print::{pp, pprust};
-import util::{ppaux, filesearch};
+import util::ppaux;
 import back::link;
 import result::{ok, err};
 import std::getopts;
diff --git a/src/rustc/driver/session.rs b/src/rustc/driver/session.rs
index 85cbc2d3a1ae..362fa823460f 100644
--- a/src/rustc/driver/session.rs
+++ b/src/rustc/driver/session.rs
@@ -4,7 +4,7 @@ import syntax::ast::node_id;
 import codemap::span;
 import syntax::ast::{int_ty, uint_ty, float_ty};
 import syntax::parse::parse_sess;
-import util::filesearch;
+import metadata::filesearch;
 import back::target_strs;
 import back::link;
 import middle::lint;
diff --git a/src/rustc/metadata.rs b/src/rustc/metadata.rs
index 7303aae64388..609f2af38ddd 100644
--- a/src/rustc/metadata.rs
+++ b/src/rustc/metadata.rs
@@ -19,8 +19,6 @@ mod driver {
 mod util {
     import ppaux = util_::ppaux;
     export ppaux;
-    import filesearch = util_::filesearch;
-    export filesearch;
 }
 
 mod lib {
diff --git a/src/rustc/metadata/creader.rs b/src/rustc/metadata/creader.rs
index 0fadf1b1f68f..2aacd87cbe85 100644
--- a/src/rustc/metadata/creader.rs
+++ b/src/rustc/metadata/creader.rs
@@ -11,7 +11,7 @@ import syntax::visit;
 import syntax::codemap::span;
 import std::map::{hashmap, int_hash};
 import syntax::print::pprust;
-import util::filesearch::filesearch;
+import filesearch::filesearch;
 import common::*;
 
 export read_crates;
diff --git a/src/rustc/util/filesearch.rs b/src/rustc/metadata/filesearch.rs
similarity index 100%
rename from src/rustc/util/filesearch.rs
rename to src/rustc/metadata/filesearch.rs
diff --git a/src/rustc/metadata/loader.rs b/src/rustc/metadata/loader.rs
index da991ec0c2ac..2123a6179f09 100644
--- a/src/rustc/metadata/loader.rs
+++ b/src/rustc/metadata/loader.rs
@@ -9,7 +9,6 @@ import syntax::{ast, attr};
 import syntax::print::pprust;
 import syntax::codemap::span;
 import lib::llvm::{False, llvm, mk_object_file, mk_section_iter};
-import util::filesearch;
 import filesearch::filesearch;
 import io::writer_util;
 
diff --git a/src/rustc/rustc.rc b/src/rustc/rustc.rc
index 81f5f467847a..fd200efe624e 100644
--- a/src/rustc/rustc.rc
+++ b/src/rustc/rustc.rc
@@ -122,6 +122,7 @@ mod metadata {
     export tyencode;
     export tydecode;
     export loader;
+    export filesearch;
 
     mod common;
     mod tyencode;
@@ -132,6 +133,7 @@ mod metadata {
     mod cstore;
     mod csearch;
     mod loader;
+    mod filesearch;
 }
 
 mod driver {
@@ -142,7 +144,6 @@ mod driver {
 mod util {
     mod common;
     mod ppaux;
-    mod filesearch;
 }
 
 mod lib {
diff --git a/src/rustdoc/astsrv.rs b/src/rustdoc/astsrv.rs
index ebe0d108f4da..235a1c18ca5b 100644
--- a/src/rustdoc/astsrv.rs
+++ b/src/rustdoc/astsrv.rs
@@ -17,7 +17,7 @@ import syntax::ast;
 import syntax::codemap;
 import syntax::ast_map;
 import rustc::back::link;
-import rustc::util::filesearch;
+import rustc::metadata::filesearch;
 import rustc::front;
 import rustc::middle::resolve;