Moving lib items into classes