Drop subpackage tag, replace with new package tag
Update spacing and drop subpackage tag