getting rid of subpackage