Refactor: class => lib/
Got the concatentating bit right