Move terminals under cbm/ directory