Tidying up the directory structures.