New organization for API12

Exit code no more used