Api structure

Awesome! Pull request accepted