* Add app package and move logic over from api package * Change app package functions to return errors * Move non-api tests into app package * Fix merge