Fixing some (more) broken imports from our previous refactor into removing google packaging. Update readme.