regex tweaks because of new directory structures