Revert "struct"

This reverts commit 473d0da6389a8f7d4a418436e05fd3ddd33a05d8.