Reorganized imports for updated library

The new version of this library will have a slightly different package
name. It'll require you to reorganize imports.

(Ctrl + O in Eclipse)