Revert "structure modified again"

This reverts commit c1c6716dfb73761323c03c6b2800cbf33e95544e.