v0.2.2

 - update deps
 - minor reorganization