rearrange classes
move some shit around