mega update

move class.* files into 'class' dir;
a lot of changes in models