refactor struct
Revert "refactor struct"

This reverts commit fe1d74e0409a770b9a7e6501119de638f0a3e9d4.
refactor struct