Feature/dir walking