Moved path stuff out of Win/unix if/else