Reference ContactInfoControl from new AddressAndPersonalDetails.Controls library
Remove dependence on type in Escc.HouseStyle