Model

Rearrange classes