Merge pull request #34 from bazelbuild/reorganize_packages

reorganize builder packages