Support windows paths better

This will allow spaces in filenames
Revert "Support windows paths better"

This reverts commit f22644c77eb621e7e446d0fc3ab7ce5e5a9bb50e.
Save an extra pass over the files