Finishing up reorg, including type parameterizations and naming conventions.