Builders class moved into another package