1. Fix parsing of includeSubFolder, and 2. track nested folders so rules can be found