reorg'ed files
removed old strategy for generating output tables