Major refactoring of IrisSharp