refactor packages
handle results of draw