Added back all cli tools.
Fixed import for pivot app.