changes for multi-folder support with watch