Improve nesting of in-progress directory structure to avoid large directies when scaling to many samples