Removing STRUCTURE constant from system.  Using data-specified structures instead.
Merge branch 'structure-refactor'