Adding Refactor tasks and diagrams

[skip ci]