Convert to IAugmentItem, move classes