Shortens package names further

Fixes Issue #4