Changed top-level packaging. Fixes #23