refactor Fields out of Form and Field
update version