Simplify directory layout.

Relates #160.