split the various *Api classes into somethin more sensible