Corrected subfolder paths through regeneration