Handle nested folder case