rework directory structures