Change structure and add cli file path.