refactored into main driver, class impl, header
minor cleanup
Merge branch 'master' of https://github.com/psastras/fp15745