Set the correct folders after a bit of fiddling about