Move Contrib.Regex into Contrib.Sandbox to match upstream