Even more refactoring including fixes for file matches to negate template, generated and node modules directories