added api structure
Merge branch 'dev'