reorganized directory structures