get rid of obsolete classes, rename existing classes..