Updated directory structure.

Closes #5