moved core files back to vendor for compatibility