Rename entity directory -> cbes