Revert "Structure clean-up"

This reverts commit 863c42c4bbd38cf98139ca178ee07d1584ba2066.