Separate rest_steps into multiple files