Splitted projects. Added CategoryMatcher.