moved lib into classes