added file/dir objects, added fixtures