Revert "Beginnings of work on structure placement."

This reverts commit 8284f3f5b4735b932e45b4c05505c43edcfcda56.
Ran astyle on source files. Code is now much cleaner.