Preparation for reorg; a few interface fixes.

Create class for each region instead and move these to owning region?