reorganized classes, fixed sizing