Change to use builder and build_server as gem
Remove builder as it was load from another repository