diff --git a/src/Flux.jl b/src/Flux.jl
index 8c8ac7c2..1cdb48a5 100644
--- a/src/Flux.jl
+++ b/src/Flux.jl
@@ -19,8 +19,10 @@ export @net, unroll, unroll1, @shapes,
 include("core.jl")
 import .FluxCore: graph
 
+include("Tracker/Tracker.jl")
+using .Tracker
+
 include("utils.jl")
-include("grad/track.jl")
 include("params.jl")
 
 include("compiler/code.jl")
diff --git a/src/grad/track.jl b/src/Tracker/Tracker.jl
similarity index 98%
rename from src/grad/track.jl
rename to src/Tracker/Tracker.jl
index b8125aa4..24a1950c 100644
--- a/src/grad/track.jl
+++ b/src/Tracker/Tracker.jl
@@ -1,3 +1,5 @@
+module Tracker
+
 data(x) = x
 
 struct Call{F,As<:Tuple}
@@ -54,3 +56,5 @@ function Base.showarray(io::IO, X::Var, repr::Bool = true; header = true)
     Base.showarray(io, data(X), false, header = false)
   end
 end
+
+end
diff --git a/src/grad/lib.jl b/src/Tracker/lib.jl
similarity index 100%
rename from src/grad/lib.jl
rename to src/Tracker/lib.jl