Revert "Structs are awkward to namespace under."

This reverts commit 48c87e4f77a33b27f27e4cbc87b28f4c3c727a59.