Tidied up directory structures