Made changes to deal with the fact that there pck rawDir can be outDir