Move lib to the top-level so tests/coverage can easily distinguish our code vs external code.
Twiddle the imports.