Refactor: class => lib/