moved DependencyMatcher parser to its own file
renamed traits