Fixed directory structure.
Fixed directory structure.

See issue #17.