Nested hash directories, fixes #32