#145: Consistent directory name, and dependencies

Resolves #145.