a little renaming and reorganization
more reorg.  sorry it's half done and broken