Matching namespaces to directory structure some more