Move methods back out of libraries until we find a pattern that works.
Release 0.2.1

Move methods back out of libraries until we find a pattern that works