Complete refactoring on Windows.