Put chart-folder references in their own scope