Rearrange terb members

Terb cut up