Rework API application

Change-Id: I0a1009be4c0f82236565cc1cbdaeb89d7f33ccd8
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>