Refactoring performed to avoid code duplication in FlowCommand and StepCommand
Packages added to group files