Extracted more into WithDirectory as was more shared for dir tasks
Merge branch 'master' into refactor
Merge pull request #52 from loz/refactor

Pulls more dir responsibility into WithDirectory