Fix Windows stuff to follow the existing source organization.