Moved join_builder to separate file
Moved tracer