mcmc problem fixed, also reordered folders