Move PBC to clauses conversion to new class