Revert "flatten log folders to 4 levels deep"

This reverts commit e755ca65af3d115990b23f0a65b749c8adcf9087.

This issue is common across many jobs; re-doing later more thoroughly.