diff --git a/matlab/CutSample.m b/matlab/estimation/CutSample.m
similarity index 100%
rename from matlab/CutSample.m
rename to matlab/estimation/CutSample.m
diff --git a/matlab/GetAllPosteriorDraws.m b/matlab/estimation/GetAllPosteriorDraws.m
similarity index 100%
rename from matlab/GetAllPosteriorDraws.m
rename to matlab/estimation/GetAllPosteriorDraws.m
diff --git a/matlab/GetOneDraw.m b/matlab/estimation/GetOneDraw.m
similarity index 100%
rename from matlab/GetOneDraw.m
rename to matlab/estimation/GetOneDraw.m
diff --git a/matlab/GetPosteriorMeanVariance.m b/matlab/estimation/GetPosteriorMeanVariance.m
similarity index 100%
rename from matlab/GetPosteriorMeanVariance.m
rename to matlab/estimation/GetPosteriorMeanVariance.m
diff --git a/matlab/GetPosteriorParametersStatistics.m b/matlab/estimation/GetPosteriorParametersStatistics.m
similarity index 100%
rename from matlab/GetPosteriorParametersStatistics.m
rename to matlab/estimation/GetPosteriorParametersStatistics.m
diff --git a/matlab/PlotPosteriorDistributions.m b/matlab/estimation/PlotPosteriorDistributions.m
similarity index 100%
rename from matlab/PlotPosteriorDistributions.m
rename to matlab/estimation/PlotPosteriorDistributions.m
diff --git a/matlab/PosteriorIRF.m b/matlab/estimation/PosteriorIRF.m
similarity index 100%
rename from matlab/PosteriorIRF.m
rename to matlab/estimation/PosteriorIRF.m
diff --git a/matlab/PosteriorIRF_core1.m b/matlab/estimation/PosteriorIRF_core1.m
similarity index 100%
rename from matlab/PosteriorIRF_core1.m
rename to matlab/estimation/PosteriorIRF_core1.m
diff --git a/matlab/PosteriorIRF_core2.m b/matlab/estimation/PosteriorIRF_core2.m
similarity index 100%
rename from matlab/PosteriorIRF_core2.m
rename to matlab/estimation/PosteriorIRF_core2.m
diff --git a/matlab/ReshapeMatFiles.m b/matlab/estimation/ReshapeMatFiles.m
similarity index 100%
rename from matlab/ReshapeMatFiles.m
rename to matlab/estimation/ReshapeMatFiles.m
diff --git a/matlab/TaRB_optimizer_wrapper.m b/matlab/estimation/TaRB_optimizer_wrapper.m
similarity index 100%
rename from matlab/TaRB_optimizer_wrapper.m
rename to matlab/estimation/TaRB_optimizer_wrapper.m
diff --git a/matlab/calibrate_mh_scale_parameter.m b/matlab/estimation/calibrate_mh_scale_parameter.m
similarity index 100%
rename from matlab/calibrate_mh_scale_parameter.m
rename to matlab/estimation/calibrate_mh_scale_parameter.m
diff --git a/matlab/check_bounds_and_definiteness_estimation.m b/matlab/estimation/check_bounds_and_definiteness_estimation.m
similarity index 100%
rename from matlab/check_bounds_and_definiteness_estimation.m
rename to matlab/estimation/check_bounds_and_definiteness_estimation.m
diff --git a/matlab/check_dsge_var_model.m b/matlab/estimation/check_dsge_var_model.m
similarity index 100%
rename from matlab/check_dsge_var_model.m
rename to matlab/estimation/check_dsge_var_model.m
diff --git a/matlab/check_for_calibrated_covariances.m b/matlab/estimation/check_for_calibrated_covariances.m
similarity index 100%
rename from matlab/check_for_calibrated_covariances.m
rename to matlab/estimation/check_for_calibrated_covariances.m
diff --git a/matlab/check_name.m b/matlab/estimation/check_name.m
similarity index 100%
rename from matlab/check_name.m
rename to matlab/estimation/check_name.m
diff --git a/matlab/check_particle_filter_options.m b/matlab/estimation/check_particle_filter_options.m
similarity index 100%
rename from matlab/check_particle_filter_options.m
rename to matlab/estimation/check_particle_filter_options.m
diff --git a/matlab/check_posterior_analysis_data.m b/matlab/estimation/check_posterior_analysis_data.m
similarity index 100%
rename from matlab/check_posterior_analysis_data.m
rename to matlab/estimation/check_posterior_analysis_data.m
diff --git a/matlab/check_posterior_sampler_options.m b/matlab/estimation/check_posterior_sampler_options.m
similarity index 100%
rename from matlab/check_posterior_sampler_options.m
rename to matlab/estimation/check_posterior_sampler_options.m
diff --git a/matlab/check_prior_analysis_data.m b/matlab/estimation/check_prior_analysis_data.m
similarity index 100%
rename from matlab/check_prior_analysis_data.m
rename to matlab/estimation/check_prior_analysis_data.m
diff --git a/matlab/check_prior_bounds.m b/matlab/estimation/check_prior_bounds.m
similarity index 100%
rename from matlab/check_prior_bounds.m
rename to matlab/estimation/check_prior_bounds.m
diff --git a/matlab/chol_SE.m b/matlab/estimation/chol_SE.m
similarity index 100%
rename from matlab/chol_SE.m
rename to matlab/estimation/chol_SE.m
diff --git a/matlab/compute_Pinf_Pstar.m b/matlab/estimation/compute_Pinf_Pstar.m
similarity index 100%
rename from matlab/compute_Pinf_Pstar.m
rename to matlab/estimation/compute_Pinf_Pstar.m
diff --git a/matlab/compute_mh_covariance_matrix.m b/matlab/estimation/compute_mh_covariance_matrix.m
similarity index 100%
rename from matlab/compute_mh_covariance_matrix.m
rename to matlab/estimation/compute_mh_covariance_matrix.m
diff --git a/matlab/delete_mh_history_files.m b/matlab/estimation/delete_mh_history_files.m
similarity index 100%
rename from matlab/delete_mh_history_files.m
rename to matlab/estimation/delete_mh_history_files.m
diff --git a/matlab/display_estimation_results_table.m b/matlab/estimation/display_estimation_results_table.m
similarity index 100%
rename from matlab/display_estimation_results_table.m
rename to matlab/estimation/display_estimation_results_table.m
diff --git a/matlab/do_parameter_initialization.m b/matlab/estimation/do_parameter_initialization.m
similarity index 100%
rename from matlab/do_parameter_initialization.m
rename to matlab/estimation/do_parameter_initialization.m
diff --git a/matlab/draw_prior_density.m b/matlab/estimation/draw_prior_density.m
similarity index 100%
rename from matlab/draw_prior_density.m
rename to matlab/estimation/draw_prior_density.m
diff --git a/matlab/dsge_conditional_likelihood_1.m b/matlab/estimation/dsge_conditional_likelihood_1.m
similarity index 100%
rename from matlab/dsge_conditional_likelihood_1.m
rename to matlab/estimation/dsge_conditional_likelihood_1.m
diff --git a/matlab/dsge_likelihood.m b/matlab/estimation/dsge_likelihood.m
similarity index 100%
rename from matlab/dsge_likelihood.m
rename to matlab/estimation/dsge_likelihood.m
diff --git a/matlab/dsge_simulated_theoretical_conditional_variance_decomposition.m b/matlab/estimation/dsge_simulated_theoretical_conditional_variance_decomposition.m
similarity index 100%
rename from matlab/dsge_simulated_theoretical_conditional_variance_decomposition.m
rename to matlab/estimation/dsge_simulated_theoretical_conditional_variance_decomposition.m
diff --git a/matlab/dsge_simulated_theoretical_correlation.m b/matlab/estimation/dsge_simulated_theoretical_correlation.m
similarity index 100%
rename from matlab/dsge_simulated_theoretical_correlation.m
rename to matlab/estimation/dsge_simulated_theoretical_correlation.m
diff --git a/matlab/dsge_simulated_theoretical_covariance.m b/matlab/estimation/dsge_simulated_theoretical_covariance.m
similarity index 100%
rename from matlab/dsge_simulated_theoretical_covariance.m
rename to matlab/estimation/dsge_simulated_theoretical_covariance.m
diff --git a/matlab/dsge_simulated_theoretical_variance_decomposition.m b/matlab/estimation/dsge_simulated_theoretical_variance_decomposition.m
similarity index 100%
rename from matlab/dsge_simulated_theoretical_variance_decomposition.m
rename to matlab/estimation/dsge_simulated_theoretical_variance_decomposition.m
diff --git a/matlab/dsge_var_likelihood.m b/matlab/estimation/dsge_var_likelihood.m
similarity index 100%
rename from matlab/dsge_var_likelihood.m
rename to matlab/estimation/dsge_var_likelihood.m
diff --git a/matlab/dynare_estimation.m b/matlab/estimation/dynare_estimation.m
similarity index 100%
rename from matlab/dynare_estimation.m
rename to matlab/estimation/dynare_estimation.m
diff --git a/matlab/dynare_estimation_1.m b/matlab/estimation/dynare_estimation_1.m
similarity index 100%
rename from matlab/dynare_estimation_1.m
rename to matlab/estimation/dynare_estimation_1.m
diff --git a/matlab/dynare_estimation_init.m b/matlab/estimation/dynare_estimation_init.m
similarity index 100%
rename from matlab/dynare_estimation_init.m
rename to matlab/estimation/dynare_estimation_init.m
diff --git a/matlab/endogenous_prior.m b/matlab/estimation/endogenous_prior.m
similarity index 100%
rename from matlab/endogenous_prior.m
rename to matlab/estimation/endogenous_prior.m
diff --git a/matlab/evaluate_likelihood.m b/matlab/estimation/evaluate_likelihood.m
similarity index 100%
rename from matlab/evaluate_likelihood.m
rename to matlab/estimation/evaluate_likelihood.m
diff --git a/matlab/evaluate_posterior_kernel.m b/matlab/estimation/evaluate_posterior_kernel.m
similarity index 100%
rename from matlab/evaluate_posterior_kernel.m
rename to matlab/estimation/evaluate_posterior_kernel.m
diff --git a/matlab/evaluate_prior.m b/matlab/estimation/evaluate_prior.m
similarity index 100%
rename from matlab/evaluate_prior.m
rename to matlab/estimation/evaluate_prior.m
diff --git a/matlab/execute_prior_posterior_function.m b/matlab/estimation/execute_prior_posterior_function.m
similarity index 100%
rename from matlab/execute_prior_posterior_function.m
rename to matlab/estimation/execute_prior_posterior_function.m
diff --git a/matlab/fill_mh_mode.m b/matlab/estimation/fill_mh_mode.m
similarity index 100%
rename from matlab/fill_mh_mode.m
rename to matlab/estimation/fill_mh_mode.m
diff --git a/matlab/generate_trace_plots.m b/matlab/estimation/generate_trace_plots.m
similarity index 100%
rename from matlab/generate_trace_plots.m
rename to matlab/estimation/generate_trace_plots.m
diff --git a/matlab/get_matrix_entries_for_psd_check.m b/matlab/estimation/get_matrix_entries_for_psd_check.m
similarity index 100%
rename from matlab/get_matrix_entries_for_psd_check.m
rename to matlab/estimation/get_matrix_entries_for_psd_check.m
diff --git a/matlab/get_moments_size.m b/matlab/estimation/get_moments_size.m
similarity index 100%
rename from matlab/get_moments_size.m
rename to matlab/estimation/get_moments_size.m
diff --git a/matlab/get_name_of_the_last_mh_file.m b/matlab/estimation/get_name_of_the_last_mh_file.m
similarity index 100%
rename from matlab/get_name_of_the_last_mh_file.m
rename to matlab/estimation/get_name_of_the_last_mh_file.m
diff --git a/matlab/get_posterior_parameters.m b/matlab/estimation/get_posterior_parameters.m
similarity index 100%
rename from matlab/get_posterior_parameters.m
rename to matlab/estimation/get_posterior_parameters.m
diff --git a/matlab/initial_estimation_checks.m b/matlab/estimation/initial_estimation_checks.m
similarity index 100%
rename from matlab/initial_estimation_checks.m
rename to matlab/estimation/initial_estimation_checks.m
diff --git a/matlab/isprior.m b/matlab/estimation/isprior.m
similarity index 100%
rename from matlab/isprior.m
rename to matlab/estimation/isprior.m
diff --git a/matlab/list_of_parameters_calibrated_as_Inf.m b/matlab/estimation/list_of_parameters_calibrated_as_Inf.m
similarity index 100%
rename from matlab/list_of_parameters_calibrated_as_Inf.m
rename to matlab/estimation/list_of_parameters_calibrated_as_Inf.m
diff --git a/matlab/list_of_parameters_calibrated_as_NaN.m b/matlab/estimation/list_of_parameters_calibrated_as_NaN.m
similarity index 100%
rename from matlab/list_of_parameters_calibrated_as_NaN.m
rename to matlab/estimation/list_of_parameters_calibrated_as_NaN.m
diff --git a/matlab/load_first_mh_history_file.m b/matlab/estimation/load_first_mh_history_file.m
similarity index 100%
rename from matlab/load_first_mh_history_file.m
rename to matlab/estimation/load_first_mh_history_file.m
diff --git a/matlab/load_last_mh_history_file.m b/matlab/estimation/load_last_mh_history_file.m
similarity index 100%
rename from matlab/load_last_mh_history_file.m
rename to matlab/estimation/load_last_mh_history_file.m
diff --git a/matlab/lpdfgam.m b/matlab/estimation/lpdfgam.m
similarity index 100%
rename from matlab/lpdfgam.m
rename to matlab/estimation/lpdfgam.m
diff --git a/matlab/lpdfgbeta.m b/matlab/estimation/lpdfgbeta.m
similarity index 100%
rename from matlab/lpdfgbeta.m
rename to matlab/estimation/lpdfgbeta.m
diff --git a/matlab/lpdfig1.m b/matlab/estimation/lpdfig1.m
similarity index 100%
rename from matlab/lpdfig1.m
rename to matlab/estimation/lpdfig1.m
diff --git a/matlab/lpdfig2.m b/matlab/estimation/lpdfig2.m
similarity index 100%
rename from matlab/lpdfig2.m
rename to matlab/estimation/lpdfig2.m
diff --git a/matlab/lpdfnorm.m b/matlab/estimation/lpdfnorm.m
similarity index 100%
rename from matlab/lpdfnorm.m
rename to matlab/estimation/lpdfnorm.m
diff --git a/matlab/marginal_density.m b/matlab/estimation/marginal_density.m
similarity index 100%
rename from matlab/marginal_density.m
rename to matlab/estimation/marginal_density.m
diff --git a/matlab/maximize_prior_density.m b/matlab/estimation/maximize_prior_density.m
similarity index 100%
rename from matlab/maximize_prior_density.m
rename to matlab/estimation/maximize_prior_density.m
diff --git a/matlab/metropolis_draw.m b/matlab/estimation/metropolis_draw.m
similarity index 100%
rename from matlab/metropolis_draw.m
rename to matlab/estimation/metropolis_draw.m
diff --git a/matlab/mh_autocorrelation_function.m b/matlab/estimation/mh_autocorrelation_function.m
similarity index 100%
rename from matlab/mh_autocorrelation_function.m
rename to matlab/estimation/mh_autocorrelation_function.m
diff --git a/matlab/minus_logged_prior_density.m b/matlab/estimation/minus_logged_prior_density.m
similarity index 100%
rename from matlab/minus_logged_prior_density.m
rename to matlab/estimation/minus_logged_prior_density.m
diff --git a/matlab/mode_check.m b/matlab/estimation/mode_check.m
similarity index 100%
rename from matlab/mode_check.m
rename to matlab/estimation/mode_check.m
diff --git a/matlab/model_comparison.m b/matlab/estimation/model_comparison.m
similarity index 100%
rename from matlab/model_comparison.m
rename to matlab/estimation/model_comparison.m
diff --git a/matlab/non_linear_dsge_likelihood.m b/matlab/estimation/non_linear_dsge_likelihood.m
similarity index 100%
rename from matlab/non_linear_dsge_likelihood.m
rename to matlab/estimation/non_linear_dsge_likelihood.m
diff --git a/matlab/optimize_prior.m b/matlab/estimation/optimize_prior.m
similarity index 100%
rename from matlab/optimize_prior.m
rename to matlab/estimation/optimize_prior.m
diff --git a/matlab/plot_priors.m b/matlab/estimation/plot_priors.m
similarity index 100%
rename from matlab/plot_priors.m
rename to matlab/estimation/plot_priors.m
diff --git a/matlab/pm3.m b/matlab/estimation/pm3.m
similarity index 100%
rename from matlab/pm3.m
rename to matlab/estimation/pm3.m
diff --git a/matlab/pm3_core.m b/matlab/estimation/pm3_core.m
similarity index 100%
rename from matlab/pm3_core.m
rename to matlab/estimation/pm3_core.m
diff --git a/matlab/posterior_analysis.m b/matlab/estimation/posterior_analysis.m
similarity index 100%
rename from matlab/posterior_analysis.m
rename to matlab/estimation/posterior_analysis.m
diff --git a/matlab/posterior_moments.m b/matlab/estimation/posterior_moments.m
similarity index 100%
rename from matlab/posterior_moments.m
rename to matlab/estimation/posterior_moments.m
diff --git a/matlab/posterior_sampler.m b/matlab/estimation/posterior_sampler.m
similarity index 100%
rename from matlab/posterior_sampler.m
rename to matlab/estimation/posterior_sampler.m
diff --git a/matlab/posterior_sampler_core.m b/matlab/estimation/posterior_sampler_core.m
similarity index 100%
rename from matlab/posterior_sampler_core.m
rename to matlab/estimation/posterior_sampler_core.m
diff --git a/matlab/posterior_sampler_initialization.m b/matlab/estimation/posterior_sampler_initialization.m
similarity index 100%
rename from matlab/posterior_sampler_initialization.m
rename to matlab/estimation/posterior_sampler_initialization.m
diff --git a/matlab/posterior_sampler_iteration.m b/matlab/estimation/posterior_sampler_iteration.m
similarity index 100%
rename from matlab/posterior_sampler_iteration.m
rename to matlab/estimation/posterior_sampler_iteration.m
diff --git a/matlab/print_table_prior.m b/matlab/estimation/print_table_prior.m
similarity index 100%
rename from matlab/print_table_prior.m
rename to matlab/estimation/print_table_prior.m
diff --git a/matlab/prior_analysis.m b/matlab/estimation/prior_analysis.m
similarity index 100%
rename from matlab/prior_analysis.m
rename to matlab/estimation/prior_analysis.m
diff --git a/matlab/prior_bounds.m b/matlab/estimation/prior_bounds.m
similarity index 100%
rename from matlab/prior_bounds.m
rename to matlab/estimation/prior_bounds.m
diff --git a/matlab/prior_draw.m b/matlab/estimation/prior_draw.m
similarity index 100%
rename from matlab/prior_draw.m
rename to matlab/estimation/prior_draw.m
diff --git a/matlab/prior_posterior_statistics.m b/matlab/estimation/prior_posterior_statistics.m
similarity index 100%
rename from matlab/prior_posterior_statistics.m
rename to matlab/estimation/prior_posterior_statistics.m
diff --git a/matlab/prior_posterior_statistics_core.m b/matlab/estimation/prior_posterior_statistics_core.m
similarity index 100%
rename from matlab/prior_posterior_statistics_core.m
rename to matlab/estimation/prior_posterior_statistics_core.m
diff --git a/matlab/prior_sampler.m b/matlab/estimation/prior_sampler.m
similarity index 100%
rename from matlab/prior_sampler.m
rename to matlab/estimation/prior_sampler.m
diff --git a/matlab/priordens.m b/matlab/estimation/priordens.m
similarity index 100%
rename from matlab/priordens.m
rename to matlab/estimation/priordens.m
diff --git a/matlab/qr2.m b/matlab/estimation/qr2.m
similarity index 100%
rename from matlab/qr2.m
rename to matlab/estimation/qr2.m
diff --git a/matlab/recursive_moments.m b/matlab/estimation/recursive_moments.m
similarity index 100%
rename from matlab/recursive_moments.m
rename to matlab/estimation/recursive_moments.m
diff --git a/matlab/rotated_slice_sampler.m b/matlab/estimation/rotated_slice_sampler.m
similarity index 100%
rename from matlab/rotated_slice_sampler.m
rename to matlab/estimation/rotated_slice_sampler.m
diff --git a/matlab/selec_posterior_draws.m b/matlab/estimation/selec_posterior_draws.m
similarity index 100%
rename from matlab/selec_posterior_draws.m
rename to matlab/estimation/selec_posterior_draws.m
diff --git a/matlab/set_measurement_errors.m b/matlab/estimation/set_measurement_errors.m
similarity index 100%
rename from matlab/set_measurement_errors.m
rename to matlab/estimation/set_measurement_errors.m
diff --git a/matlab/set_prior.m b/matlab/estimation/set_prior.m
similarity index 100%
rename from matlab/set_prior.m
rename to matlab/estimation/set_prior.m
diff --git a/matlab/size_of_the_reduced_form_model.m b/matlab/estimation/size_of_the_reduced_form_model.m
similarity index 100%
rename from matlab/size_of_the_reduced_form_model.m
rename to matlab/estimation/size_of_the_reduced_form_model.m
diff --git a/matlab/slice_sampler.m b/matlab/estimation/slice_sampler.m
similarity index 100%
rename from matlab/slice_sampler.m
rename to matlab/estimation/slice_sampler.m
diff --git a/matlab/trace_plot.m b/matlab/estimation/trace_plot.m
similarity index 100%
rename from matlab/trace_plot.m
rename to matlab/estimation/trace_plot.m
diff --git a/matlab/uniform_specification.m b/matlab/estimation/uniform_specification.m
similarity index 100%
rename from matlab/uniform_specification.m
rename to matlab/estimation/uniform_specification.m
diff --git a/matlab/update_last_mh_history_file.m b/matlab/estimation/update_last_mh_history_file.m
similarity index 100%
rename from matlab/update_last_mh_history_file.m
rename to matlab/estimation/update_last_mh_history_file.m
diff --git a/matlab/var_sample_moments.m b/matlab/estimation/var_sample_moments.m
similarity index 100%
rename from matlab/var_sample_moments.m
rename to matlab/estimation/var_sample_moments.m
diff --git a/matlab/variance_decomposition_ME_mc_analysis.m b/matlab/estimation/variance_decomposition_ME_mc_analysis.m
similarity index 100%
rename from matlab/variance_decomposition_ME_mc_analysis.m
rename to matlab/estimation/variance_decomposition_ME_mc_analysis.m
diff --git a/matlab/variance_decomposition_mc_analysis.m b/matlab/estimation/variance_decomposition_mc_analysis.m
similarity index 100%
rename from matlab/variance_decomposition_mc_analysis.m
rename to matlab/estimation/variance_decomposition_mc_analysis.m
diff --git a/matlab/write_mh_history_file.m b/matlab/estimation/write_mh_history_file.m
similarity index 100%
rename from matlab/write_mh_history_file.m
rename to matlab/estimation/write_mh_history_file.m