reorg command_utils