ocd
Simplify by keeping all code in lib
Release patch 0.1.1