Fixes #36 - Replace packages with packageOf