rearrange and rename classes
rearrange more classes