Minor fixes for windows install
Adding moved files
Additional tweaks for Windows