Renaming package to be same as import name

in prep for reorganizing to be usable as a library.