Merged Win and WinConf structs, windows.h and wincontrol.h. Also lots of refactoring on the way.