Activity-specific folders in Journal

Fixes #3856