Drop subpackage tag, replace with new package tag