Cleanup package names - references #108
Revert "Fixing broken tests"

This reverts commit 6465d8668dbf45cf90d403044efb714930b4be91.
Cleanup package names - fixes #108