tidy up folder to be up to current master