restructred cli tools to a table