Changed directory & URI path collections->c; refactored directory tests; all tests pass