promote back some of the files to core