Updated directory structures etc
Setup directory structure
Setup directory structure