granule: unify, add CVS bb file