fix and reorg hadoop workunits