factored out the api portion to a separate project
Merge remote-tracking branch 'origin/refactor-api'