Renamed package to something slightly more sane