Cleaned up directory structures