Refactoring template chaos
Added dynamic call with 2 operands, rearranged files