Revert "More sophisticated structure"

This reverts commit 3b043fbbd36609bda1917b731f9815a7bdce2e79.