Refactored tasks and operators to begin to move towards a more standalone set of tools