move some important classes from old version to here