Update the file and directory structures.

Fix #18