ERT-757: Minor reorg to support windows build
Merge pull request #625 from joakim-hove/ERT-757-fixup

ERT-757: Minor reorg to support windows build