refs #1965 - Moved fields to field_instrument
Merge pull request #64 from cristiroma/master

refs #1965 - Moved fields to field_instrument