move some classes that should belong to core to the core.
Merge pull request #390 from gcheng/morecore

move some classes that should belong to core to the core.