refactor + fix directory bug
Merge branch 'master' of https://github.com/nate-parrott/Flashlight