diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m
index c0b5c4294..e4f9506d8 100644
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
@@ -58,6 +58,7 @@ addpath([dynareroot '/particle/'])
 addpath([dynareroot '/gsa/'])
 addpath([dynareroot '/ep/'])
 addpath([dynareroot '/lmmcp/'])
+addpath([dynareroot '/optimization/'])
 addpath([dynareroot '/modules/dates/src/'])
 addpath([dynareroot '/modules/dseries/src/'])
 addpath([dynareroot '/utilities/doc/'])
diff --git a/matlab/cmaes.m b/matlab/optimization/cmaes.m
similarity index 100%
rename from matlab/cmaes.m
rename to matlab/optimization/cmaes.m
diff --git a/matlab/csminit1.m b/matlab/optimization/csminit1.m
similarity index 100%
rename from matlab/csminit1.m
rename to matlab/optimization/csminit1.m
diff --git a/matlab/csminwel1.m b/matlab/optimization/csminwel1.m
similarity index 100%
rename from matlab/csminwel1.m
rename to matlab/optimization/csminwel1.m
diff --git a/matlab/dynare_minimize_objective.m b/matlab/optimization/dynare_minimize_objective.m
similarity index 100%
rename from matlab/dynare_minimize_objective.m
rename to matlab/optimization/dynare_minimize_objective.m
diff --git a/matlab/gmhmaxlik.m b/matlab/optimization/gmhmaxlik.m
similarity index 100%
rename from matlab/gmhmaxlik.m
rename to matlab/optimization/gmhmaxlik.m
diff --git a/matlab/mr_gstep.m b/matlab/optimization/mr_gstep.m
similarity index 100%
rename from matlab/mr_gstep.m
rename to matlab/optimization/mr_gstep.m
diff --git a/matlab/mr_hessian.m b/matlab/optimization/mr_hessian.m
similarity index 100%
rename from matlab/mr_hessian.m
rename to matlab/optimization/mr_hessian.m
diff --git a/matlab/numgrad2.m b/matlab/optimization/numgrad2.m
similarity index 100%
rename from matlab/numgrad2.m
rename to matlab/optimization/numgrad2.m
diff --git a/matlab/numgrad3.m b/matlab/optimization/numgrad3.m
similarity index 100%
rename from matlab/numgrad3.m
rename to matlab/optimization/numgrad3.m
diff --git a/matlab/numgrad3_.m b/matlab/optimization/numgrad3_.m
similarity index 100%
rename from matlab/numgrad3_.m
rename to matlab/optimization/numgrad3_.m
diff --git a/matlab/numgrad5.m b/matlab/optimization/numgrad5.m
similarity index 100%
rename from matlab/numgrad5.m
rename to matlab/optimization/numgrad5.m
diff --git a/matlab/numgrad5_.m b/matlab/optimization/numgrad5_.m
similarity index 100%
rename from matlab/numgrad5_.m
rename to matlab/optimization/numgrad5_.m
diff --git a/matlab/simplex_optimization_routine.m b/matlab/optimization/simplex_optimization_routine.m
similarity index 100%
rename from matlab/simplex_optimization_routine.m
rename to matlab/optimization/simplex_optimization_routine.m
diff --git a/matlab/simpsa.m b/matlab/optimization/simpsa.m
similarity index 100%
rename from matlab/simpsa.m
rename to matlab/optimization/simpsa.m
diff --git a/matlab/simpsaget.m b/matlab/optimization/simpsaget.m
similarity index 100%
rename from matlab/simpsaget.m
rename to matlab/optimization/simpsaget.m
diff --git a/matlab/simpsaset.m b/matlab/optimization/simpsaset.m
similarity index 100%
rename from matlab/simpsaset.m
rename to matlab/optimization/simpsaset.m