Support BND!=dir name
Allow nested directory structures