folder change corrections
On the way, not working yet, blame it on the first approx