Refactor tasks to support more code sharing between different systems.
Bump version