Fixing some out-of-date @package annotations since moving classes