Squashed 'api/' changes from 148a445..3c2126b

3c2126b Clean up

git-subtree-dir: api
git-subtree-split: 3c2126bf049a2a816b0cc10b1fe11c7aa94011d2
Merge commit 'e0248c555ddaccf07700ff200ea354bbbf5f9813' into reorganization
Added npm scripts for pulling subtree branches
Fixed conflicts