HUGE changes to the structure as a result of switching to Windows only