restructure directory structures