Adding in the new directory structures.