Reorganize to put API and App classes into just API class