- Class rename and organise for workflow classes