Move extra modules into 'lib', with path-hackery; bring in our own copy of pkg_resources