Move most of shared stuff into the new engines