diff --git a/latex/dyn_tbx.aux b/doc/gsa/dyn_tbx.aux
similarity index 100%
rename from latex/dyn_tbx.aux
rename to doc/gsa/dyn_tbx.aux
diff --git a/latex/dyn_tbx.bbl b/doc/gsa/dyn_tbx.bbl
similarity index 100%
rename from latex/dyn_tbx.bbl
rename to doc/gsa/dyn_tbx.bbl
diff --git a/latex/dyn_tbx.blg b/doc/gsa/dyn_tbx.blg
similarity index 100%
rename from latex/dyn_tbx.blg
rename to doc/gsa/dyn_tbx.blg
diff --git a/latex/dyn_tbx.dvi b/doc/gsa/dyn_tbx.dvi
similarity index 100%
rename from latex/dyn_tbx.dvi
rename to doc/gsa/dyn_tbx.dvi
diff --git a/latex/dyn_tbx.log b/doc/gsa/dyn_tbx.log
similarity index 100%
rename from latex/dyn_tbx.log
rename to doc/gsa/dyn_tbx.log
diff --git a/latex/dyn_tbx.pdf b/doc/gsa/dyn_tbx.pdf
similarity index 100%
rename from latex/dyn_tbx.pdf
rename to doc/gsa/dyn_tbx.pdf
diff --git a/latex/dyn_tbx.ps b/doc/gsa/dyn_tbx.ps
similarity index 100%
rename from latex/dyn_tbx.ps
rename to doc/gsa/dyn_tbx.ps
diff --git a/latex/dyn_tbx.tex b/doc/gsa/dyn_tbx.tex
similarity index 100%
rename from latex/dyn_tbx.tex
rename to doc/gsa/dyn_tbx.tex
diff --git a/latex/dyn_tbx.tex.bak b/doc/gsa/dyn_tbx.tex.bak
similarity index 100%
rename from latex/dyn_tbx.tex.bak
rename to doc/gsa/dyn_tbx.tex.bak
diff --git a/latex/marco.bib b/doc/gsa/marco.bib
similarity index 100%
rename from latex/marco.bib
rename to doc/gsa/marco.bib
diff --git a/latex/marco.bib.bak b/doc/gsa/marco.bib.bak
similarity index 100%
rename from latex/marco.bib.bak
rename to doc/gsa/marco.bib.bak
diff --git a/GSA_distrib/LPTAU.m b/matlab/gsa/LPTAU.m
similarity index 100%
rename from GSA_distrib/LPTAU.m
rename to matlab/gsa/LPTAU.m
diff --git a/GSA_distrib/Morris_Measure_Groups.m b/matlab/gsa/Morris_Measure_Groups.m
similarity index 100%
rename from GSA_distrib/Morris_Measure_Groups.m
rename to matlab/gsa/Morris_Measure_Groups.m
diff --git a/GSA_distrib/Sampling_Function_2.m b/matlab/gsa/Sampling_Function_2.m
similarity index 100%
rename from GSA_distrib/Sampling_Function_2.m
rename to matlab/gsa/Sampling_Function_2.m
diff --git a/GSA_distrib/beta_inv.m b/matlab/gsa/beta_inv.m
similarity index 100%
rename from GSA_distrib/beta_inv.m
rename to matlab/gsa/beta_inv.m
diff --git a/GSA_distrib/beta_pdf.m b/matlab/gsa/beta_pdf.m
similarity index 100%
rename from GSA_distrib/beta_pdf.m
rename to matlab/gsa/beta_pdf.m
diff --git a/GSA_distrib/cumplot.m b/matlab/gsa/cumplot.m
similarity index 100%
rename from GSA_distrib/cumplot.m
rename to matlab/gsa/cumplot.m
diff --git a/GSA_distrib/dat_fil_.m b/matlab/gsa/dat_fil_.m
similarity index 100%
rename from GSA_distrib/dat_fil_.m
rename to matlab/gsa/dat_fil_.m
diff --git a/GSA_distrib/dynare_MC.m b/matlab/gsa/dynare_MC.m
similarity index 100%
rename from GSA_distrib/dynare_MC.m
rename to matlab/gsa/dynare_MC.m
diff --git a/GSA_distrib/fdjac.m b/matlab/gsa/fdjac.m
similarity index 100%
rename from GSA_distrib/fdjac.m
rename to matlab/gsa/fdjac.m
diff --git a/GSA_distrib/filt_mc_.m b/matlab/gsa/filt_mc_.m
similarity index 100%
rename from GSA_distrib/filt_mc_.m
rename to matlab/gsa/filt_mc_.m
diff --git a/GSA_distrib/gamm_cdf.m b/matlab/gsa/gamm_cdf.m
similarity index 100%
rename from GSA_distrib/gamm_cdf.m
rename to matlab/gsa/gamm_cdf.m
diff --git a/GSA_distrib/gamm_inv.m b/matlab/gsa/gamm_inv.m
similarity index 100%
rename from GSA_distrib/gamm_inv.m
rename to matlab/gsa/gamm_inv.m
diff --git a/GSA_distrib/gamm_pdf.m b/matlab/gsa/gamm_pdf.m
similarity index 100%
rename from GSA_distrib/gamm_pdf.m
rename to matlab/gsa/gamm_pdf.m
diff --git a/GSA_distrib/ghx2transition.m b/matlab/gsa/ghx2transition.m
similarity index 100%
rename from GSA_distrib/ghx2transition.m
rename to matlab/gsa/ghx2transition.m
diff --git a/GSA_distrib/log_trans_.m b/matlab/gsa/log_trans_.m
similarity index 100%
rename from GSA_distrib/log_trans_.m
rename to matlab/gsa/log_trans_.m
diff --git a/GSA_distrib/lptauSEQ.m b/matlab/gsa/lptauSEQ.m
similarity index 100%
rename from GSA_distrib/lptauSEQ.m
rename to matlab/gsa/lptauSEQ.m
diff --git a/GSA_distrib/map_ident_.m b/matlab/gsa/map_ident_.m
similarity index 100%
rename from GSA_distrib/map_ident_.m
rename to matlab/gsa/map_ident_.m
diff --git a/GSA_distrib/mc_moments.m b/matlab/gsa/mc_moments.m
similarity index 100%
rename from GSA_distrib/mc_moments.m
rename to matlab/gsa/mc_moments.m
diff --git a/GSA_distrib/myboxplot.m b/matlab/gsa/myboxplot.m
similarity index 100%
rename from GSA_distrib/myboxplot.m
rename to matlab/gsa/myboxplot.m
diff --git a/GSA_distrib/myprctilecol.m b/matlab/gsa/myprctilecol.m
similarity index 100%
rename from GSA_distrib/myprctilecol.m
rename to matlab/gsa/myprctilecol.m
diff --git a/GSA_distrib/norm_inv.m b/matlab/gsa/norm_inv.m
similarity index 100%
rename from GSA_distrib/norm_inv.m
rename to matlab/gsa/norm_inv.m
diff --git a/GSA_distrib/optget.m b/matlab/gsa/optget.m
similarity index 100%
rename from GSA_distrib/optget.m
rename to matlab/gsa/optget.m
diff --git a/GSA_distrib/prior_draw_gsa.m b/matlab/gsa/prior_draw_gsa.m
similarity index 100%
rename from GSA_distrib/prior_draw_gsa.m
rename to matlab/gsa/prior_draw_gsa.m
diff --git a/GSA_distrib/priorcdf.m b/matlab/gsa/priorcdf.m
similarity index 100%
rename from GSA_distrib/priorcdf.m
rename to matlab/gsa/priorcdf.m
diff --git a/GSA_distrib/read_data.m b/matlab/gsa/read_data.m
similarity index 100%
rename from GSA_distrib/read_data.m
rename to matlab/gsa/read_data.m
diff --git a/GSA_distrib/redform_map.m b/matlab/gsa/redform_map.m
similarity index 100%
rename from GSA_distrib/redform_map.m
rename to matlab/gsa/redform_map.m
diff --git a/GSA_distrib/redform_screen.m b/matlab/gsa/redform_screen.m
similarity index 100%
rename from GSA_distrib/redform_screen.m
rename to matlab/gsa/redform_screen.m
diff --git a/GSA_distrib/set_shocks_param.m b/matlab/gsa/set_shocks_param.m
similarity index 100%
rename from GSA_distrib/set_shocks_param.m
rename to matlab/gsa/set_shocks_param.m
diff --git a/GSA_distrib/skewness.m b/matlab/gsa/skewness.m
similarity index 100%
rename from GSA_distrib/skewness.m
rename to matlab/gsa/skewness.m
diff --git a/GSA_distrib/smirnov.m b/matlab/gsa/smirnov.m
similarity index 100%
rename from GSA_distrib/smirnov.m
rename to matlab/gsa/smirnov.m
diff --git a/GSA_distrib/speed.m b/matlab/gsa/speed.m
similarity index 100%
rename from GSA_distrib/speed.m
rename to matlab/gsa/speed.m
diff --git a/GSA_distrib/stab_map_.m b/matlab/gsa/stab_map_.m
similarity index 100%
rename from GSA_distrib/stab_map_.m
rename to matlab/gsa/stab_map_.m
diff --git a/GSA_distrib/stab_map_1.m b/matlab/gsa/stab_map_1.m
similarity index 100%
rename from GSA_distrib/stab_map_1.m
rename to matlab/gsa/stab_map_1.m
diff --git a/GSA_distrib/stab_map_2.m b/matlab/gsa/stab_map_2.m
similarity index 100%
rename from GSA_distrib/stab_map_2.m
rename to matlab/gsa/stab_map_2.m
diff --git a/GSA_distrib/stand_.m b/matlab/gsa/stand_.m
similarity index 100%
rename from GSA_distrib/stand_.m
rename to matlab/gsa/stand_.m
diff --git a/GSA_distrib/teff.m b/matlab/gsa/teff.m
similarity index 100%
rename from GSA_distrib/teff.m
rename to matlab/gsa/teff.m
diff --git a/GSA_distrib/th_moments.m b/matlab/gsa/th_moments.m
similarity index 100%
rename from GSA_distrib/th_moments.m
rename to matlab/gsa/th_moments.m
diff --git a/GSA_distrib/thet2tau.m b/matlab/gsa/thet2tau.m
similarity index 100%
rename from GSA_distrib/thet2tau.m
rename to matlab/gsa/thet2tau.m
diff --git a/GSA_distrib/trank.m b/matlab/gsa/trank.m
similarity index 100%
rename from GSA_distrib/trank.m
rename to matlab/gsa/trank.m
diff --git a/demo/data_ca1.m b/tests/gsa/data_ca1.m
similarity index 100%
rename from demo/data_ca1.m
rename to tests/gsa/data_ca1.m
diff --git a/demo/data_ca1.mat b/tests/gsa/data_ca1.mat
similarity index 100%
rename from demo/data_ca1.mat
rename to tests/gsa/data_ca1.mat
diff --git a/demo/ls2003.mod b/tests/gsa/ls2003.mod
similarity index 100%
rename from demo/ls2003.mod
rename to tests/gsa/ls2003.mod
diff --git a/demo/ls2003_mean.mat b/tests/gsa/ls2003_mean.mat
similarity index 100%
rename from demo/ls2003_mean.mat
rename to tests/gsa/ls2003_mean.mat
diff --git a/demo/ls2003_mode.mat b/tests/gsa/ls2003_mode.mat
similarity index 100%
rename from demo/ls2003_mode.mat
rename to tests/gsa/ls2003_mode.mat
diff --git a/demo/ls2003_results.mat b/tests/gsa/ls2003_results.mat
similarity index 100%
rename from demo/ls2003_results.mat
rename to tests/gsa/ls2003_results.mat
diff --git a/demo/ls2003ide.mod b/tests/gsa/ls2003ide.mod
similarity index 100%
rename from demo/ls2003ide.mod
rename to tests/gsa/ls2003ide.mod
diff --git a/demo/ls2003scr.mod b/tests/gsa/ls2003scr.mod
similarity index 100%
rename from demo/ls2003scr.mod
rename to tests/gsa/ls2003scr.mod
diff --git a/demo/ls2003scr_mean.mat b/tests/gsa/ls2003scr_mean.mat
similarity index 100%
rename from demo/ls2003scr_mean.mat
rename to tests/gsa/ls2003scr_mean.mat
diff --git a/demo/ls2003scr_mode.mat b/tests/gsa/ls2003scr_mode.mat
similarity index 100%
rename from demo/ls2003scr_mode.mat
rename to tests/gsa/ls2003scr_mode.mat
diff --git a/demo/ls2003scr_results.mat b/tests/gsa/ls2003scr_results.mat
similarity index 100%
rename from demo/ls2003scr_results.mat
rename to tests/gsa/ls2003scr_results.mat