Revert "Change structure"

This reverts commit f1d3f552c2a66521b24f91af225c05c39e6546f6.