Moved FieldType out of extra package and renamed it