Add package as class parameter

In case the defaults aren't good enough
Remove cruft and bumb version number