Replaced windows hard coded runtime version with binding to latest version
Moved around some functions to the intended context within the file