fully re-jig, references to old package name now updated