Refactored tasks into a new package