adding scalar struct field
Revert "little more import cleanup"

This reverts commit 729f2d52b1737756306082a79732c4118c83a3a5.
Merge branch 'mg-codegen' of github.com:bitgirder/bitgirder-main into mg-codegen-save
Merge branch 'mg-codegen-save' into mg-codegen