Revert "Final structure"

This reverts commit 7869d060819c463eeacc83d1f59517e4ee933ddc.