Remove @subpackage

Closes #16