Split library class into separate file