Fixed date bug
Refactored to old package name