moved more classes to library