move stuff to core