Revert "Revert "Structure clean-up""

This reverts commit 1a12cebceac278b4d83bb89aeb76ed5db769496c.