Add derive flags to allow finer controls.
Migrate to single-directory-per-dataset policy.