more tidying of folders