changed structure of classes. and naming styles of variables