Refactor win/unix build