Add dir index files
remove spy
Fix move and mock out locking support