Move a few files to the core

... and change every last import >.>