Revert "Structure Changes"

This reverts commit 5cc03576cf8477b513703f53f30f0cc133268284.