Minor reorginizations
Remove local isolation completely
Add version to api
Fix some bugs in Controller
First attempt at WS client