Added a little bit of organization in jit builder, cmd add almost completely on jit