Avoid empty folders

Discard empty folders both on load and on save. They are not
interesting - the shell won't show them, and you can just
recreate them when you need them.