Added '--find' arg for infix matching
Splitted modules