split into client/server; some cleanup
Merge branch 'hotfix/1.3.0'