reorganise directory structures