reorg classes
Merge branch 'master' of github.com:gamemachine/gamemachine