Refactor
Adds graceful-fs
Rearranges tests