Refactored grunt task organization