Major reorg.
Continued reorg. Mass renames.