Updates to work with windows
rename done in 2 steps so that git understands