Cleaned up and corrected package definition