Support namespace roots mapped to subdirectories.

Seems like the Target Directory fix for locating a long namespace without nested folders only worked for root.  This extends that feature to any subdirectory.