Weave in container awareness, so folders can act as entry containers.

This may be close to working. The folders are not being synced right, so
they're not being found when visited.