Various changes to adapt to the exclusion folder