Revert "Revert "Revert "Structure clean-up"""

This reverts commit 2ea48d3d158a1da8b9495a335d55bcc2e762340f.