Merge pull request #62 from bazelbuild/refactor_builder

Builder reorganisation