Revise storage layout to keep number of directories low.

Fixes #16