Rework, split cli
Update readme