Tweaked some more directory structures