Change back to the BarrelEndcap5D version to two files which are common. Pixel10D doesn't have a copy.