add Package type
wrap long lines; blank line between packages