Updating to reflect latest refactoring (icon,hoi,itk) in i library