slight refactor/reorg.  better naming and classes in separate files