Package Refactoring. Slight spelling change