Eliminate dependence on folder name

Resolves #22