Add dir factory
Merge branch 'master' of github.com:soundcloud/cotterpin