Package grouping and docblock tweaks