Merge "Refactor MC windirver plugin namespace"