diff --git a/library/debugger/cli.lean b/library/tools/debugger/cli.lean
similarity index 99%
rename from library/debugger/cli.lean
rename to library/tools/debugger/cli.lean
index cc0bf1e781..f0a6cc3f38 100644
--- a/library/debugger/cli.lean
+++ b/library/tools/debugger/cli.lean
@@ -5,7 +5,7 @@ Authors: Leonardo de Moura
 
 Simple command line interface for debugging Lean programs and tactics.
 -/
-import debugger.util
+import tools.debugger.util
 
 namespace debugger
 
diff --git a/library/debugger/default.lean b/library/tools/debugger/default.lean
similarity index 78%
rename from library/debugger/default.lean
rename to library/tools/debugger/default.lean
index 23cd7d0f01..9c2dd95c14 100644
--- a/library/debugger/default.lean
+++ b/library/tools/debugger/default.lean
@@ -3,4 +3,4 @@ Copyright (c) 2016 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import debugger.util debugger.cli
+import tools.debugger.util tools.debugger.cli
diff --git a/library/debugger/util.lean b/library/tools/debugger/util.lean
similarity index 100%
rename from library/debugger/util.lean
rename to library/tools/debugger/util.lean
diff --git a/tmp/debugger_example.lean b/tmp/debugger_example.lean
index 12c5d17e4b..b18b57871f 100644
--- a/tmp/debugger_example.lean
+++ b/tmp/debugger_example.lean
@@ -1,4 +1,4 @@
-import debugger
+import tools.debugger
 
 set_option debugger true
 set_option debugger.autorun true