ERT-757: Minor reorg to support windows build