rename classes, made registration and some more