Fix bad import following rename
Fix os dependant paths in fetcher.