Major renames and reorg to structure, part of ongoing effort to make
code more readable and eventually rebalance testing approach
further refacturing to set stage for rebalancing testing approach