Break the new Windows check code up into multiple files