Note struct declared
Added filename matcher
Fixed filename matching regex
regexps refactored a bit