Moved and renamed CLI client