Feature/first pass reorg

This is a proposal of further reorg that makes sense to Alejandro and me.  Let us know what you think.