make directory structures more consistent