Split api into models

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
Merge branch 'release/0.003'