Moved directory structures to make it more pythonic.