Eliminate the extra subpackage