Revert "improve structure"

This reverts commit fbb05a2de6e396338ffd576c85f8c676e8170855.