Reorganization of cli-specific classes