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