Add the option to reorder composite steps and files reorganization