Add sample directory
New regexes
Simplify