FL-899: create new directories with cvs, prune old ones