Refactor to use new package classes in windows_python