Add api struct
Merge branch 'api-org'