Resolved file system dependencies. Should work on windows and Mac also.