Re-add fetch alias
Fix new dir paths