Fix directory structures