first pass at simplifying HashMap to store all folders, empty or not
test bugs squashed; tests pass (up to concurrent append)