Remove graceful-fs dependency
Code refactors