I saw that after I commented. I think the ADAMRecordField is also in the wrong place and have submitted a new PR to fix that.