diff --git a/src/Turing.jl b/src/Turing.jl
index 33286a6651..ba7f41385a 100644
--- a/src/Turing.jl
+++ b/src/Turing.jl
@@ -49,12 +49,12 @@ using .Utilities
 include("essential/Essential.jl")
 Base.@deprecate_binding Core Essential false
 using .Essential
-include("inference/Inference.jl")  # inference algorithms
+include("mcmc/Inference.jl")  # inference algorithms
 using .Inference
 include("variational/VariationalInference.jl")
 using .Variational
 
-include("modes/ModeEstimation.jl")
+include("optimisation/ModeEstimation.jl")
 using .ModeEstimation
 
 ###########
diff --git a/src/inference/AdvancedSMC.jl b/src/mcmc/AdvancedSMC.jl
similarity index 100%
rename from src/inference/AdvancedSMC.jl
rename to src/mcmc/AdvancedSMC.jl
diff --git a/src/inference/Inference.jl b/src/mcmc/Inference.jl
similarity index 100%
rename from src/inference/Inference.jl
rename to src/mcmc/Inference.jl
diff --git a/src/inference/emcee.jl b/src/mcmc/emcee.jl
similarity index 100%
rename from src/inference/emcee.jl
rename to src/mcmc/emcee.jl
diff --git a/src/inference/ess.jl b/src/mcmc/ess.jl
similarity index 100%
rename from src/inference/ess.jl
rename to src/mcmc/ess.jl
diff --git a/src/inference/gibbs.jl b/src/mcmc/gibbs.jl
similarity index 100%
rename from src/inference/gibbs.jl
rename to src/mcmc/gibbs.jl
diff --git a/src/inference/gibbs_conditional.jl b/src/mcmc/gibbs_conditional.jl
similarity index 100%
rename from src/inference/gibbs_conditional.jl
rename to src/mcmc/gibbs_conditional.jl
diff --git a/src/inference/hmc.jl b/src/mcmc/hmc.jl
similarity index 100%
rename from src/inference/hmc.jl
rename to src/mcmc/hmc.jl
diff --git a/src/inference/is.jl b/src/mcmc/is.jl
similarity index 100%
rename from src/inference/is.jl
rename to src/mcmc/is.jl
diff --git a/src/inference/mh.jl b/src/mcmc/mh.jl
similarity index 100%
rename from src/inference/mh.jl
rename to src/mcmc/mh.jl
diff --git a/src/modes/ModeEstimation.jl b/src/optimisation/ModeEstimation.jl
similarity index 100%
rename from src/modes/ModeEstimation.jl
rename to src/optimisation/ModeEstimation.jl