more changes to directory structures