Flattening redundant folder