More Structure Changes

chipping away at the older codebase.