Refactor CLI director client specs

Signed-off-by: Maria Shaldibina <mariash@pivotallabs.com>