Tidied up and merged the start of the API
Tidied up directory structures