Refactor tracer, join call tracer + execution trace to full trace

Refactor tracer, join call tracer + execution trace to full trace #90