Drop unused dependency
Use class to define library objects
Adjust package entry point