Renamed classes to library