rearrange package names - git fix #57
Rework multiple field - git fix #58