diff --git a/docs/literate/sketches/preorders.jl b/docs/literate/sketches/preorders.jl
index 0e44012e2..358486d90 100644
--- a/docs/literate/sketches/preorders.jl
+++ b/docs/literate/sketches/preorders.jl
@@ -114,7 +114,7 @@ end
 # expressions are represented at expression trees
 ex = compose(P, [:f, :g])
 # the head of an expression is the root of the expression tree
-Catlab.head(ex)
+GATs.head(ex)
 # the julia type of the expression
 typeof(ex)
 # the GAT type of the expression
diff --git a/docs/make.jl b/docs/make.jl
index 74ce51415..53940f9f2 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -5,10 +5,7 @@ const literate_dir = joinpath(@__DIR__, "literate")
 const generated_dir = joinpath(@__DIR__, "src", "generated")
 
 @info "Loading Catlab.jl"
-using Catlab.GATs,
-  # Must explicitly load all submodules for which docs are needed.
-  Catlab.Theories, Catlab.CategoricalAlgebra, Catlab.Graphs,
-  Catlab.WiringDiagrams, Catlab.Graphics, Catlab.Programs
+using Catlab
 
 const no_literate = "--no-literate" in ARGS
 if !no_literate
diff --git a/src/Catlab.jl b/src/Catlab.jl
index 5a6ee04d9..4cf3d6815 100644
--- a/src/Catlab.jl
+++ b/src/Catlab.jl
@@ -4,15 +4,19 @@ using Reexport
 
 include("gats/GATs.jl")
 include("theories/Theories.jl")
-
 include("categorical_algebra/ACSetsGATsInterop.jl")
 include("graphs/Graphs.jl")
 include("categorical_algebra/CategoricalAlgebra.jl")
-
 include("wiring_diagrams/WiringDiagrams.jl")
 include("graphics/Graphics.jl")
 include("programs/Programs.jl")
 
 @reexport using .GATs
+@reexport using .Theories
+@reexport using .Graphs
+@reexport using .CategoricalAlgebra
+@reexport using .WiringDiagrams
+@reexport using .Graphics
+@reexport using .Programs
 
 end