Added file and directory functionality, two tests pass