Revert "Re-structure."

This reverts commit 24ff0ca6200fbf88e7e6a0af003c363d4b0c3a88.
Again.