Update and rename TeamBuilder.scala to Builder.scala