Updated directory structures and PM