a bit of refactoring
Merge branch 'master' of github.com:zhemao/xactor
set up some infrastructure