Planning on that as a separate PR.  Don't want to move things into lib/ until I have time to write actual test cases around them.