feat(api): adjust to use internal classes
Merge pull request #4 from Eric-Brison/master

feat(api): adjust to use internal classes