Some re-org prep for appveyor build