Split api bundle to seperate business object from api handlers, add tests